diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java index ad8e7ed4..7ee20e1f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java @@ -13,7 +13,9 @@ public class ConsultationTaskKey { 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_START_1 = "depart_leader_start_1"; // 各部所主管级领导分发 + + public static final String DEPART_LEADER_START_2 = "depart_leader_start_2"; // 各部所主管级领导分发 public static final String DEPART_LEADER_END_1 = "depart_leader_end_1"; // 各部所主管级领导汇总 @@ -35,4 +37,10 @@ public class ConsultationTaskKey { public static final String DESIGN_ENGINEER_2 = "design_engineer_2"; // 设计工程师填写征求意见 + public static final String SUB_PROCESS_1 = "sub_process_1"; // 子流程 + + public static final String SUB_PROCESS_2 = "sub_process_2"; // 子流程 + + public static final String SUB_PROCESS_3 = "sub_process_3"; // 子流程 + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index f06243fe..cc4ac102 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -118,7 +118,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImplFlow_0azsibi - + Flow_0azsibi Flow_19vxot3 @@ -18,17 +18,17 @@ Flow_1gv6jmb - + Flow_1gv6jmb Flow_0hpm8eq - + Flow_0hpm8eq Flow_05oz1ja Flow_1ezcutn - + Flow_05oz1ja Flow_09jjte7 @@ -45,7 +45,7 @@ Flow_18olfei - + Flow_1ezcutn Flow_0oc8671 @@ -77,10 +77,10 @@ - + ${passFirst} - + Flow_18olfei Flow_1t037bu @@ -111,14 +111,14 @@ - + Flow_19vxot3 Flow_0g6wwzz Flow_1f5fu60 Flow_1125yee - + Flow_1125yee Flow_0sb0q1z @@ -143,24 +143,23 @@ - + Flow_0jjkrst Flow_1f5fu60 ${nrOfInstances== nrOfCompletedInstances} - Flow_1bfoa9n + Flow_07p5ivp - Flow_1bfoa9n Flow_1ft2poj + Flow_0q5ae61 Flow_0mdmcs5 ${nrOfInstances== nrOfCompletedInstances} - Flow_0mdmcs5 Flow_0flbibd @@ -181,11 +180,17 @@ ${!passSecond} + + Flow_07p5ivp + Flow_0q5ae61 + + + - + ${passThird == 3} - + @@ -196,13 +201,17 @@ - + + + + + - + @@ -220,7 +229,7 @@ - + @@ -326,9 +335,9 @@ - - - + + + @@ -340,58 +349,62 @@ - - - - - - + + - - - - - - - + + - + - - + + + + + + + + + + + - - - - - - + + - - + + - - + + - + - - - - + + + + - + + + + + + + + + @@ -417,15 +430,13 @@ - - - + - + - + @@ -437,10 +448,9 @@ - - - - + + +