diff --git a/.gitignore b/.gitignore index dd3e5a7dcdfc47cb7b49822f634d54addca1e026..e94d2f29e982c3ed4828fc66140d643951e2b5c7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,4 @@ buildNumber.properties .idea/ webApp/src/test/ upms-server/src/test/ -/upms-server/upms-server.iml -/camunda/camunda.iml -/common/common.iml -/flowclient/flowclient.iml -/onlyofficeclient/onlyofficeclient.iml +*.iml diff --git a/camunda/pom.xml b/camunda/pom.xml index dfdd21ca022c3ea1027e0d134351ea634892aa99..de8eae419e6f65d456e245651b4a94a106dc844f 100644 --- a/camunda/pom.xml +++ b/camunda/pom.xml @@ -16,6 +16,12 @@ org.camunda.bpm.springboot camunda-bpm-spring-boot-starter-rest 3.2.0 + + + mybatis + org.mybatis + + org.camunda.bpm.springboot diff --git a/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java b/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java index 083adba619cf31a9f32da31dee3d1aa6196ecb30..afcd6b25a95d9fee0551f0317eacbc355f862e9c 100644 --- a/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java +++ b/camunda/src/main/java/net/qqxh/sunflow/controller/ProjectController.java @@ -26,11 +26,11 @@ public class ProjectController { private static class ProjectParticipateRequestRecord { Long studentId; - Long projectParticipateId; + String projectParticipateId; String taskId; - public Long getProjectParticipateId() { + public String getProjectParticipateId() { return projectParticipateId; } @@ -38,7 +38,7 @@ public class ProjectController { return studentId; } - public void setProjectParticipateId(Long projectParticipateId) { + public void setProjectParticipateId(String projectParticipateId) { this.projectParticipateId = projectParticipateId; } @@ -158,7 +158,7 @@ public class ProjectController { Map variables = taskService.getVariables(taskId); Long studentId = Long.valueOf ( (String)variables.get(ProjectProcessConstant.VAR_NAME_STUDENT) ); - Long recordId = (Long) variables.get(ProjectProcessConstant.FORM_RECORD_ID); + String recordId = ""+ variables.get(ProjectProcessConstant.FORM_RECORD_ID); record.setStudentId(studentId); record.setProjectParticipateId(recordId); record.setTaskId(taskId); diff --git a/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java b/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java new file mode 100644 index 0000000000000000000000000000000000000000..7b34a6fc1ca56b06551de93f42d1d901657a88e1 --- /dev/null +++ b/camunda/src/main/java/net/qqxh/sunflow/swagger/Swagger2.java @@ -0,0 +1,29 @@ +package net.qqxh.sunflow.swagger; + +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class Swagger2 { + + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .paths(PathSelectors.any()) + .build(); + } + + public ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("camunda") + .version("1.0") + .build(); + } +} diff --git a/camunda/src/main/resources/project.bpmn b/camunda/src/main/resources/project.bpmn index a376c9205d24a120f4ae0532d5b4ac7faede0de4..f25bceb4b43095f8fa73ff16b8fb3cda555580fa 100644 --- a/camunda/src/main/resources/project.bpmn +++ b/camunda/src/main/resources/project.bpmn @@ -1,10 +1,10 @@ - + - + SequenceFlow_0896wbg @@ -13,8 +13,8 @@ - - + + SequenceFlow_0896wbg @@ -56,8 +56,8 @@ - - + + SequenceFlow_1d807sw @@ -93,113 +93,111 @@ - + - + - - + + - + - + - + - - + + - - + + - - - + + + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - - + + - - + + - - - + + + - + - + - + - - + + - - - + + + - - + + - + - - diff --git a/common/common.iml b/common/common.iml deleted file mode 100644 index 80008835a48fa33861482203a6c43f68e5a0617b..0000000000000000000000000000000000000000 --- a/common/common.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index b5ae220fc67c8314c36ce586e1f375c4672a8590..1a10b4b94c1980187f8d0c0adf39de33b1a7c46f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -46,12 +46,22 @@ 1.9 + + io.springfox + springfox-swagger2 + 2.9.2 + + + com.github.xiaoymin + knife4j-spring-ui + 1.9.6 + com.baomidou mybatis-plus-boot-starter - 3.1.0 + 3.3.1 mysql @@ -67,7 +77,7 @@ com.baomidou mybatis-plus-generator - 3.1.0 + 3.3.1 org.apache.velocity diff --git a/doc/sql/sunFlow.sql b/doc/sql/sunFlow.sql index 10684cd971b1a8a18b9f88633dcfdd46f78f98c9..cbcb49622df6ac00ddef88c9ebc6450faacc7ba6 100644 --- a/doc/sql/sunFlow.sql +++ b/doc/sql/sunFlow.sql @@ -29,6 +29,12 @@ CREATE TABLE `flow_studentapply` ( `desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '备注' ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic; +ALTER TABLE `sunflow`.`flow_studentapply` +ADD COLUMN `applyer` varchar(255) COMMENT '申请人' AFTER `desc`, +ADD COLUMN `resource` varchar(255) COMMENT '报名类型' AFTER `applyer`; +ALTER TABLE `sunflow`.`flow_studentapply` +CHANGE COLUMN `desc` `descript` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '备注' AFTER `bmtype`; + -- ---------------------------- -- Table structure for supms_dept -- ---------------------------- diff --git a/sunFlow.iml b/sunFlow.iml deleted file mode 100644 index f409c0ea8d8352a600994b03eff71bf727df5857..0000000000000000000000000000000000000000 --- a/sunFlow.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java index 9d241f343bc05a3ba3e77af41e0db257749381ac..36d3fbbe7dd0737663d9f322e9fc8d37924dcc77 100644 --- a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/bean/StudentApply.java @@ -1,8 +1,10 @@ package net.qqxh.sunflow.server.flowexample.bean; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +34,7 @@ public class StudentApply implements Serializable { /** * 学校名称 */ + @TableField("name") private String schoolname; /** * 年级 @@ -51,10 +54,13 @@ public class StudentApply implements Serializable { /** * 时间 */ - private String datetime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date datetime; /** * 报名性质 */ + @TableField(typeHandler = FastjsonTypeHandler.class) private String[] bmtype; /** * 报名类型 @@ -105,11 +111,11 @@ public class StudentApply implements Serializable { this.dateday = dateday; } - public String getDatetime() { + public Date getDatetime() { return datetime; } - public void setDatetime(String datetime) { + public void setDatetime(Date datetime) { this.datetime = datetime; } diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java index 4decbe2bc8a50751723d186e8f71fa488eaacccd..e2818aa8a5850e89e90f589b88a37973d3f63893 100644 --- a/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/flowexample/controller/StudentApplyController.java @@ -41,7 +41,7 @@ public class StudentApplyController extends BaseController { String url="http://localhost:8080/projects/project"; Map params=new HashMap(); params.put("school",studentApply.getSchoolname()); - params.put("student",studentApply.getApplyer()); + params.put("student", user.getId()); params.put("recordId",studentApply.getRecordid()); try { String response= FlowClient.sendPostDataByMap(url,params,"utf-8"); diff --git a/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java b/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java new file mode 100644 index 0000000000000000000000000000000000000000..51163679c64bb7c31588987f07b1bea481527944 --- /dev/null +++ b/upms-server/src/main/java/net/qqxh/sunflow/server/swagger/Swagger2.java @@ -0,0 +1,29 @@ +package net.qqxh.sunflow.server.swagger; + +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class Swagger2 { + + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .paths(PathSelectors.any()) + .build(); + } + + public ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("upms-server") + .version("1.0") + .build(); + } +} diff --git a/upms-server/upms-server.iml b/upms-server/upms-server.iml deleted file mode 100644 index bcd7212b936492bb8c052d30575870f000850ae9..0000000000000000000000000000000000000000 --- a/upms-server/upms-server.iml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webApp/src/api/flow/studentApply.js b/webApp/src/api/flow/studentApply.js index af8f61238428c42c1e4953647ca2fe1f1cca981d..1798b7648bf74f11f93855b9ad2c839ddfa60b27 100644 --- a/webApp/src/api/flow/studentApply.js +++ b/webApp/src/api/flow/studentApply.js @@ -1,4 +1,6 @@ import request from '@/utils/flowRequest' +import qs from 'qs' + export const studentApplyService = { list: function(params) { return request({ @@ -18,6 +20,9 @@ export const studentApplyService = { return request({ url: '/studentApply/saveinfo', method: 'post', + paramsSerializer: function(params) { + return qs.stringify(params, { arrayFormat: 'repeat' }) + }, params }) },