diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml index 6e9f24f6..cfd64646 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml @@ -13,6 +13,7 @@ pn.process_definition_id = #{processDefinitionId} + and pn.is_view = 1 and pnl.process_instance_id = #{processInstanceId} 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 7ee20e1f..db1cc80f 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 @@ -19,9 +19,9 @@ public class ConsultationTaskKey { 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_COLLECT_2 = "depart_leader_collect_2"; // 各部所主管级领导汇总 - public static final String DEPART_LEADER_END_3 = "depart_leader_end_3"; // 各部所主管级领导汇总 + public static final String DEPART_LEADER_COLLECT_3 = "depart_leader_collect_3"; // 各部所主管级领导汇总 public static final String DEPART_LEADER_END_4 = "depart_leader_end_4"; // 各部所主管级领导汇总 diff --git a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn index b6515db4..2e6b3885 100644 --- a/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn @@ -4,7 +4,7 @@ Flow_1d5objw - + Flow_1d5objw Flow_0azsibi @@ -18,7 +18,7 @@ Flow_1gv6jmb - + Flow_1gv6jmb Flow_0hpm8eq @@ -29,7 +29,7 @@ Flow_1ezcutn - + Flow_05oz1ja Flow_09jjte7 @@ -39,12 +39,12 @@ ${!passFirst} - + Flow_0oc8671 Flow_14aeapm Flow_18olfei - + Flow_1ezcutn Flow_0oc8671 @@ -54,12 +54,12 @@ Flow_13krhma - + Flow_13krhma Flow_0e4x3wm - + Flow_0e4x3wm Flow_0vnqotz @@ -67,7 +67,7 @@ - + Flow_0vnqotz Flow_05e6l5d @@ -97,12 +97,12 @@ ${!passSecond} - + Flow_09jjte7 Flow_0qai32h - - + + Flow_0f48izh Flow_14aeapm @@ -112,7 +112,7 @@ - + Flow_19vxot3 Flow_0g6wwzz Flow_1f5fu60 @@ -132,17 +132,17 @@ ${passThird == 1} - + ${passThird == 2} - + Flow_1aeqdsv Flow_0g6wwzz ${nrOfInstances== nrOfCompletedInstances} - + Flow_0jjkrst Flow_1f5fu60 @@ -152,7 +152,7 @@ Flow_07p5ivp - + Flow_1ft2poj Flow_0q5ae61 Flow_0mdmcs5 @@ -160,7 +160,7 @@ ${nrOfInstances== nrOfCompletedInstances} - + Flow_0mdmcs5 Flow_0flbibd @@ -180,7 +180,7 @@ ${!passSecond} - + Flow_07p5ivp Flow_0q5ae61 @@ -201,10 +201,6 @@ - - - - @@ -272,7 +268,7 @@ - + @@ -349,25 +345,29 @@ + + + + - - - - - + + + - - - + + + + +