diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 471f2d4f..085134f7 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -535,7 +535,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl totalMap = asmsPostUtil.sendGetReq2(url, map); Integer total = (Integer) totalMap.get("total"); map.put("pageSize", total.toString()); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java index 5b687b97..b9b18224 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java @@ -293,7 +293,7 @@ public class SynchronizationAsmsService { String url = "xiaobodata/openApi/article/search"; Map paramMap = new HashMap<>(); paramMap.put("pageNo", "1"); - paramMap.put("pageSize", "1000"); + paramMap.put("pageSize", "2"); Map totalMap = asmsPostUtil.sendGetReq2(url, paramMap); Integer total = (Integer) totalMap.get("total"); paramMap.put("pageSize", total.toString()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskId.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskId.java new file mode 100644 index 00000000..e9640c7c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskId.java @@ -0,0 +1,38 @@ +package com.jero.modules.activiti.process.fb.common; + +/** + * @Author: liao + * @Date: 2023/11/13 10:55 + * @Description: 标准征求意见流程taskId + */ +public class ConsultationTaskId { + + private ConsultationTaskId() {} + + public static final String ENGINEER_START = "engineer_start"; // 法规工程师发起 + + public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师汇总 + + public static final String DEPART_LEADER_START = "depart_leader_start"; // 各部所主管级领导分发 + + public static final String DEPART_LEADER_END_1 = "depart_leader_end_1"; // 各部所主管级领导汇总 + + public static final String DEPART_LEADER_END_2 = "depart_leader_end_2"; // 各部所主管级领导汇总 + + public static final String DEPART_LEADER_END_3 = "depart_leader_end_3"; // 各部所主管级领导汇总 + + public static final String DEPART_LEADER_END_4 = "depart_leader_end_4"; // 各部所主管级领导汇总 + + public static final String MODULE_OWNER_START = "module_owner_start"; // 模块负责人分发 + + public static final String MODULE_OWNER_END_1 = "module_owner_end_1"; // 模块负责人汇总 + + public static final String MODULE_OWNER_END_2 = "module_owner_end_2"; // 模块负责人汇总 + + public static final String MODULE_OWNER_END_3 = "module_owner_end_3"; // 模块负责人汇总 + + public static final String DESIGN_ENGINEER_1 = "design_engineer_1"; // 设计工程师填写征求意见 + + public static final String DESIGN_ENGINEER_2 = "design_engineer_2"; // 设计工程师填写征求意见 + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessUserType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessUserType.java new file mode 100644 index 00000000..154618aa --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ProcessUserType.java @@ -0,0 +1,22 @@ +package com.jero.modules.activiti.process.fb.common; + +/** + * @Author: liao + * @Date: 2023/11/13 10:06 + * @Description: 流程用户类型 + */ +public class ProcessUserType { + + private ProcessUserType() {} + + public static final String ENGINEER = "engineer"; // 法规工程师 + + public static final String DEPART_LEADER = "departLeader"; // 部所主管级领导 + + public static final String MODULE_OWNER = "moduleOwner"; // 模块负责人 + + public static final String DESIGN_ENGINEER = "designEngineer"; // 设计工程师 + + public static final String OTHER = "other"; // 其他 + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java index a987391c..d3e658ce 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java @@ -34,4 +34,8 @@ public class ProcessFbStandardConsultationVO { @ApiModelProperty(value = "征求意见列表") private List processFbConsultationLists; + /**用户类型*/ + @ApiModelProperty(value = "用户类型（engineer法规工程师、departLeader部所主管级领导、moduleOwner模块负责人、designEngineer设计工程师、other其他）") + private String userType; + } diff --git a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn index 3ff094cd..bc4ebb32 100644 --- a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn @@ -4,14 +4,13 @@ Flow_1d5objw - + Flow_1d5objw Flow_0azsibi - + Flow_0azsibi - Flow_1aeqdsv Flow_19vxot3 ${nrOfInstances== nrOfCompletedInstances} @@ -19,35 +18,35 @@ Flow_1gv6jmb - + Flow_1gv6jmb Flow_0hpm8eq - + Flow_0hpm8eq Flow_05oz1ja Flow_1ezcutn - - + + Flow_05oz1ja Flow_09jjte7 ${nrOfInstances== nrOfCompletedInstances} - + ${!passFirst} - + Flow_0oc8671 + Flow_14aeapm Flow_18olfei - + Flow_1ezcutn - Flow_0f48izh Flow_0oc8671 ${nrOfInstances== nrOfCompletedInstances} @@ -55,39 +54,39 @@ Flow_13krhma - + Flow_13krhma Flow_0e4x3wm - - + + Flow_0e4x3wm Flow_0vnqotz ${nrOfInstances== nrOfCompletedInstances} - - + + Flow_0vnqotz Flow_05e6l5d - + Flow_05e6l5d - + ${passFirst} - + Flow_18olfei Flow_1t037bu Flow_0f48izh - + Flow_1t037bu Flow_0qai32h @@ -95,88 +94,147 @@ ${passSecond} - + ${!passSecond} - + Flow_09jjte7 Flow_0qai32h - + + + Flow_0f48izh + Flow_14aeapm + + ${nrOfInstances== nrOfCompletedInstances} + + + - - + + Flow_19vxot3 + Flow_0g6wwzz + Flow_1f5fu60 Flow_1125yee - + Flow_1125yee Flow_0sb0q1z Flow_1aeqdsv + Flow_0jjkrst - + Flow_0sb0q1z - ${passThird} + ${passThird == 1} - - ${!passThird} + + ${passThird == 2} + + Flow_1aeqdsv + Flow_0g6wwzz + + ${nrOfInstances== nrOfCompletedInstances} + + + + + Flow_0jjkrst + Flow_1f5fu60 + + ${nrOfInstances== nrOfCompletedInstances} + + + Flow_1bfoa9n + + + Flow_1bfoa9n + Flow_1ft2poj + Flow_0mdmcs5 + + ${nrOfInstances== nrOfCompletedInstances} + + + + + Flow_0mdmcs5 + Flow_0flbibd + + + + Flow_0flbibd + Flow_1ta4894 + Flow_1ft2poj + + + + Flow_1ta4894 + + + ${passSecond} + + + ${!passSecond} + + + + ${passThird == 3} + + - - - - - - + + - - + + + - + + + + + + + + - - + + - - - - + - - + + - + - - - - - - + + @@ -185,15 +243,15 @@ - + - + - + @@ -216,28 +274,29 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -246,33 +305,92 @@ - - - + + + - - + + - - - + + - + - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -291,19 +409,39 @@ - - + + - + - - + + + + - + + + + + + + + + + + + + + + + + + +