ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 流程人员查询增加is_view字段

Browse Source
This commit is contained in:
liao
2023-11-17 09:52:41 +08:00
parent 9d0ffa8b3e
commit 04d51271b9
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml
+1
View File
@@ -13,6 +13,7 @@
</if>
<where>
pn.process_definition_id = #{processDefinitionId}
and pn.is_view = 1
<if test="processInstanceId != null and processInstanceId != ''">
and pnl.process_instance_id = #{processInstanceId}
</if>
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java
+2 -2
View File
@@ -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"; // 各部所主管级领导汇总
laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn
+31 -31
View File
@@ -4,7 +4,7 @@
<bpmn:startEvent id="StartEvent_1">
<bpmn:outgoing>Flow_1d5objw</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="engineer_start" name="发起，选择一个法规（可选拆分单数据）" activiti:assignee="${engineer}">
<bpmn:userTask id="engineer_start" name="法规工程师发起" activiti:assignee="${engineer}">
<bpmn:incoming>Flow_1d5objw</bpmn:incoming>
<bpmn:outgoing>Flow_0azsibi</bpmn:outgoing>
</bpmn:userTask>
@@ -18,7 +18,7 @@
<bpmn:startEvent id="Event_1olxq4s">
<bpmn:outgoing>Flow_1gv6jmb</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="depart_leader_start_1" name="分发设计工程师，是否分发给模块负责人" activiti:assignee="${departLeader}">
<bpmn:userTask id="depart_leader_start_1" name="各部所主管级领导分发" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_1gv6jmb</bpmn:incoming>
<bpmn:outgoing>Flow_0hpm8eq</bpmn:outgoing>
</bpmn:userTask>
@@ -29,7 +29,7 @@
<bpmn:outgoing>Flow_1ezcutn</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_0hpm8eq" sourceRef="depart_leader_start_1" targetRef="Gateway_0mogtm0" />
<bpmn:userTask id="design_engineer_2" name="填写征求意见，到期不填视为无意见" activiti:assignee="${designEngineer}">
<bpmn:userTask id="design_engineer_2" name="设计工程师填写征求意见" activiti:assignee="${designEngineer}">
<bpmn:incoming>Flow_05oz1ja</bpmn:incoming>
<bpmn:outgoing>Flow_09jjte7</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="designEngineerList" activiti:elementVariable="designEngineer">
@@ -39,12 +39,12 @@
<bpmn:sequenceFlow id="Flow_05oz1ja" name="否" sourceRef="Gateway_0mogtm0" targetRef="design_engineer_2">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passFirst}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="depart_leader_end_1" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
<bpmn:userTask id="depart_leader_end_1" name="各部所主管级领导审批" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_0oc8671</bpmn:incoming>
<bpmn:incoming>Flow_14aeapm</bpmn:incoming>
<bpmn:outgoing>Flow_18olfei</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_09jjte7" sourceRef="design_engineer_2" targetRef="depart_leader_end_2" />
<bpmn:sequenceFlow id="Flow_09jjte7" sourceRef="design_engineer_2" targetRef="depart_leader_collect_2" />
<bpmn:subProcess id="sub_process_2">
<bpmn:incoming>Flow_1ezcutn</bpmn:incoming>
<bpmn:outgoing>Flow_0oc8671</bpmn:outgoing>
@@ -54,12 +54,12 @@
<bpmn:startEvent id="Event_15afvr9">
<bpmn:outgoing>Flow_13krhma</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="module_owner_start" name="模块负责人" activiti:assignee="${moduleOwner}">
<bpmn:userTask id="module_owner_start" name="模块负责人分发（可跳过）" activiti:assignee="${moduleOwner}">
<bpmn:incoming>Flow_13krhma</bpmn:incoming>
<bpmn:outgoing>Flow_0e4x3wm</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_13krhma" sourceRef="Event_15afvr9" targetRef="module_owner_start" />
<bpmn:userTask id="design_engineer_1" name="填写征求意见，到期不填视为无意见" activiti:assignee="${designEngineer}">
<bpmn:userTask id="design_engineer_1" name="设计工程师填写征求意见" activiti:assignee="${designEngineer}">
<bpmn:incoming>Flow_0e4x3wm</bpmn:incoming>
<bpmn:outgoing>Flow_0vnqotz</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="designEngineerList" activiti:elementVariable="designEngineer">
@@ -67,7 +67,7 @@
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0e4x3wm" sourceRef="module_owner_start" targetRef="design_engineer_1" />
<bpmn:userTask id="module_owner_end_1" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${moduleOwner}">
<bpmn:userTask id="module_owner_end_1" name="模块负责人汇总填写意见（可跳过）" activiti:assignee="${moduleOwner}">
<bpmn:incoming>Flow_0vnqotz</bpmn:incoming>
<bpmn:outgoing>Flow_05e6l5d</bpmn:outgoing>
</bpmn:userTask>
@@ -97,12 +97,12 @@
<bpmn:sequenceFlow id="Flow_0f48izh" name="驳回" sourceRef="Gateway_1xd2kp3" targetRef="module_owner_end_2">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passSecond}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="depart_leader_end_2" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
<bpmn:userTask id="depart_leader_collect_2" name="各部所主管级领导汇总" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_09jjte7</bpmn:incoming>
<bpmn:outgoing>Flow_0qai32h</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0qai32h" sourceRef="depart_leader_end_2" targetRef="Event_0r7jsfk" />
<bpmn:userTask id="module_owner_end_2" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${moduleOwner}">
<bpmn:sequenceFlow id="Flow_0qai32h" sourceRef="depart_leader_collect_2" targetRef="Event_0r7jsfk" />
<bpmn:userTask id="module_owner_end_2" name="模块负责人汇总填写意见（可跳过）" activiti:assignee="${moduleOwner}">
<bpmn:incoming>Flow_0f48izh</bpmn:incoming>
<bpmn:outgoing>Flow_14aeapm</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
@@ -112,7 +112,7 @@
<bpmn:sequenceFlow id="Flow_14aeapm" sourceRef="module_owner_end_2" targetRef="depart_leader_end_1" />
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="engineer_start" targetRef="sub_process_1" />
<bpmn:userTask id="engineer_start_end" name="汇总结果，可修改，上传会议附件" activiti:assignee="${engineer}">
<bpmn:userTask id="engineer_start_end" name="法规工程师审批" activiti:assignee="${engineer}">
<bpmn:incoming>Flow_19vxot3</bpmn:incoming>
<bpmn:incoming>Flow_0g6wwzz</bpmn:incoming>
<bpmn:incoming>Flow_1f5fu60</bpmn:incoming>
@@ -132,17 +132,17 @@
<bpmn:sequenceFlow id="Flow_0sb0q1z" name="通过" sourceRef="Gateway_0pd0196" targetRef="Event_07yr7ob">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 1}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1aeqdsv" name="驳回" sourceRef="Gateway_0pd0196" targetRef="depart_leader_end_3">
<bpmn:sequenceFlow id="Flow_1aeqdsv" name="驳回" sourceRef="Gateway_0pd0196" targetRef="depart_leader_collect_3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 2}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="depart_leader_end_3" name="汇总全部分发人审批意见-修改/通过">
<bpmn:userTask id="depart_leader_collect_3" name="各部所主管级领导汇总">
<bpmn:incoming>Flow_1aeqdsv</bpmn:incoming>
<bpmn:outgoing>Flow_0g6wwzz</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0g6wwzz" sourceRef="depart_leader_end_3" targetRef="engineer_start_end" />
<bpmn:sequenceFlow id="Flow_0g6wwzz" sourceRef="depart_leader_collect_3" targetRef="engineer_start_end" />
<bpmn:subProcess id="sub_process_3">
<bpmn:incoming>Flow_0jjkrst</bpmn:incoming>
<bpmn:outgoing>Flow_1f5fu60</bpmn:outgoing>
@@ -152,7 +152,7 @@
<bpmn:startEvent id="Event_0eapre1">
<bpmn:outgoing>Flow_07p5ivp</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="module_owner_end_3" name="汇总全部分发人审批意见-修改/通过">
<bpmn:userTask id="module_owner_end_3" name="模块负责人汇总填写意见（可跳过）">
<bpmn:incoming>Flow_1ft2poj</bpmn:incoming>
<bpmn:incoming>Flow_0q5ae61</bpmn:incoming>
<bpmn:outgoing>Flow_0mdmcs5</bpmn:outgoing>
@@ -160,7 +160,7 @@
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:userTask id="depart_leader_end_4" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
<bpmn:userTask id="depart_leader_end_4" name="各部所主管级领导审批" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_0mdmcs5</bpmn:incoming>
<bpmn:outgoing>Flow_0flbibd</bpmn:outgoing>
</bpmn:userTask>
@@ -180,7 +180,7 @@
<bpmn:sequenceFlow id="Flow_1ft2poj" name="驳回" sourceRef="Gateway_1pq4fen" targetRef="module_owner_end_3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passSecond}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="depart_leader_start_2" name="分发设计工程师，是否分发给模块负责人" activiti:assignee="${departLeader}">
<bpmn:userTask id="depart_leader_start_2" name="各部所主管级领导审批" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_07p5ivp</bpmn:incoming>
<bpmn:outgoing>Flow_0q5ae61</bpmn:outgoing>
</bpmn:userTask>
@@ -201,10 +201,6 @@
<dc:Bounds x="160" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0k4hx5w" bpmnElement="depart_leader_end_3">
<dc:Bounds x="1780" y="480" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0mj9ddw_di" bpmnElement="sub_process_1" isExpanded="true">
<dc:Bounds x="320" y="40" width="1120" height="690" />
</bpmndi:BPMNShape>
@@ -272,7 +268,7 @@
<bpmndi:BPMNShape id="Event_0r7jsfk_di" bpmnElement="Event_0r7jsfk">
<dc:Bounds x="1252" y="552" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="depart_leader_end_2">
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="depart_leader_collect_2">
<dc:Bounds x="730" y="530" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
@@ -349,25 +345,29 @@
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
<dc:Bounds x="1492" y="502" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0k4hx5w" bpmnElement="depart_leader_collect_3">
<dc:Bounds x="1780" y="480" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qqp5sb_di" bpmnElement="sub_process_3" isExpanded="true">
<dc:Bounds x="1492" y="600" width="678" height="250" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0eapre1_di" bpmnElement="Event_0eapre1">
<dc:Bounds x="1512" y="702" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07vxc54_di" bpmnElement="Event_07vxc54">
<dc:Bounds x="2092" y="702" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1pq4fen_di" bpmnElement="Gateway_1pq4fen" isMarkerVisible="true">
<dc:Bounds x="1995" y="695" width="50" height="50" />
<bpmndi:BPMNShape id="BPMNShape_00so089" bpmnElement="module_owner_end_3">
<dc:Bounds x="1720" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_035drax" bpmnElement="depart_leader_end_4">
<dc:Bounds x="1860" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_00so089" bpmnElement="module_owner_end_3">
<dc:Bounds x="1720" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
<bpmndi:BPMNShape id="Gateway_1pq4fen_di" bpmnElement="Gateway_1pq4fen" isMarkerVisible="true">
<dc:Bounds x="1995" y="695" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07vxc54_di" bpmnElement="Event_07vxc54">
<dc:Bounds x="2092" y="702" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_19cqaly" bpmnElement="depart_leader_start_2">
<dc:Bounds x="1580" y="680" width="100" height="80" />