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

update 标准文本弹框

Browse Source
This commit is contained in:
liao
2023-11-16 14:31:16 +08:00
parent 6e7a7eeba8
commit 2117c6b5b1
4 changed files with 83 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java
+9 -1
View File
@@ -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"; // 子流程
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id
processHandleService.isMyTask(taskId); // 判断是否拥有任务处理权
if (ConsultationTaskKey.DEPART_LEADER_START.equals(taskDefinitionKey)) { // 各部所主管级领导分发
if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)) { // 各部所主管级领导分发
processDepartLeaderStart(processInfoVO);
}
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class SarFileSplitInfoEO implements Serializable {
/**文本状态*/
@Excel(name = "文本状态", width = 15, dicCode = "file_type")
@Dict(dicCode = "file_type")
@Dict(dicCode = "process_manuscript")
@ApiModelProperty(value = "文本状态")
private String fileType;
laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn
+72 -62
View File
@@ -9,7 +9,7 @@
<bpmn:outgoing>Flow_0azsibi</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1d5objw" sourceRef="StartEvent_1" targetRef="engineer_start" />
<bpmn:subProcess id="Activity_0mj9ddw">
<bpmn:subProcess id="sub_process_1">
<bpmn:incoming>Flow_0azsibi</bpmn:incoming>
<bpmn:outgoing>Flow_19vxot3</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
@@ -18,17 +18,17 @@
<bpmn:startEvent id="Event_1olxq4s">
<bpmn:outgoing>Flow_1gv6jmb</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="depart_leader_start" 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>
<bpmn:sequenceFlow id="Flow_1gv6jmb" sourceRef="Event_1olxq4s" targetRef="depart_leader_start" />
<bpmn:sequenceFlow id="Flow_1gv6jmb" sourceRef="Event_1olxq4s" targetRef="depart_leader_start_1" />
<bpmn:exclusiveGateway id="Gateway_0mogtm0">
<bpmn:incoming>Flow_0hpm8eq</bpmn:incoming>
<bpmn:outgoing>Flow_05oz1ja</bpmn:outgoing>
<bpmn:outgoing>Flow_1ezcutn</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_0hpm8eq" sourceRef="depart_leader_start" targetRef="Gateway_0mogtm0" />
<bpmn:sequenceFlow id="Flow_0hpm8eq" sourceRef="depart_leader_start_1" targetRef="Gateway_0mogtm0" />
<bpmn:userTask id="design_engineer_2" name="填写征求意见，到期不填视为无意见" activiti:assignee="${designEngineer}">
<bpmn:incoming>Flow_05oz1ja</bpmn:incoming>
<bpmn:outgoing>Flow_09jjte7</bpmn:outgoing>
@@ -45,7 +45,7 @@
<bpmn:outgoing>Flow_18olfei</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_09jjte7" sourceRef="design_engineer_2" targetRef="depart_leader_end_2" />
<bpmn:subProcess id="Activity_1pip97n">
<bpmn:subProcess id="sub_process_2">
<bpmn:incoming>Flow_1ezcutn</bpmn:incoming>
<bpmn:outgoing>Flow_0oc8671</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
@@ -77,10 +77,10 @@
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_05e6l5d" sourceRef="module_owner_end_1" targetRef="Event_1vx05is" />
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_1ezcutn" name="是" sourceRef="Gateway_0mogtm0" targetRef="Activity_1pip97n">
<bpmn:sequenceFlow id="Flow_1ezcutn" name="是" sourceRef="Gateway_0mogtm0" targetRef="sub_process_2">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passFirst}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_0oc8671" sourceRef="Activity_1pip97n" targetRef="depart_leader_end_1" />
<bpmn:sequenceFlow id="Flow_0oc8671" sourceRef="sub_process_2" targetRef="depart_leader_end_1" />
<bpmn:exclusiveGateway id="Gateway_1xd2kp3">
<bpmn:incoming>Flow_18olfei</bpmn:incoming>
<bpmn:outgoing>Flow_1t037bu</bpmn:outgoing>
@@ -111,14 +111,14 @@
</bpmn:userTask>
<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="Activity_0mj9ddw" />
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="engineer_start" targetRef="sub_process_1" />
<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>
<bpmn:outgoing>Flow_1125yee</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="Activity_0mj9ddw" targetRef="engineer_start_end" />
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="sub_process_1" targetRef="engineer_start_end" />
<bpmn:exclusiveGateway id="Gateway_0pd0196">
<bpmn:incoming>Flow_1125yee</bpmn:incoming>
<bpmn:outgoing>Flow_0sb0q1z</bpmn:outgoing>
@@ -143,24 +143,23 @@
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0g6wwzz" sourceRef="depart_leader_end_3" targetRef="engineer_start_end" />
<bpmn:subProcess id="Activity_0qqp5sb">
<bpmn:subProcess id="sub_process_3">
<bpmn:incoming>Flow_0jjkrst</bpmn:incoming>
<bpmn:outgoing>Flow_1f5fu60</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="departLeaderList" activiti:elementVariable="departLeader">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
<bpmn:startEvent id="Event_0eapre1">
<bpmn:outgoing>Flow_1bfoa9n</bpmn:outgoing>
<bpmn:outgoing>Flow_07p5ivp</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="module_owner_end_3" name="汇总全部分发人审批意见-修改/通过">
<bpmn:incoming>Flow_1bfoa9n</bpmn:incoming>
<bpmn:incoming>Flow_1ft2poj</bpmn:incoming>
<bpmn:incoming>Flow_0q5ae61</bpmn:incoming>
<bpmn:outgoing>Flow_0mdmcs5</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances== nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1bfoa9n" sourceRef="Event_0eapre1" targetRef="module_owner_end_3" />
<bpmn:userTask id="depart_leader_end_4" name="汇总全部分发人审批意见-修改/通过" activiti:assignee="${departLeader}">
<bpmn:incoming>Flow_0mdmcs5</bpmn:incoming>
<bpmn:outgoing>Flow_0flbibd</bpmn:outgoing>
@@ -181,11 +180,17 @@
<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:incoming>Flow_07p5ivp</bpmn:incoming>
<bpmn:outgoing>Flow_0q5ae61</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_07p5ivp" sourceRef="Event_0eapre1" targetRef="depart_leader_start_2" />
<bpmn:sequenceFlow id="Flow_0q5ae61" sourceRef="depart_leader_start_2" targetRef="module_owner_end_3" />
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_0jjkrst" name="驳回" sourceRef="Gateway_0pd0196" targetRef="Activity_0qqp5sb">
<bpmn:sequenceFlow id="Flow_0jjkrst" name="驳回" sourceRef="Gateway_0pd0196" targetRef="sub_process_3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passThird == 3}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1f5fu60" sourceRef="Activity_0qqp5sb" targetRef="engineer_start_end" />
<bpmn:sequenceFlow id="Flow_1f5fu60" sourceRef="sub_process_3" targetRef="engineer_start_end" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="fb-standard-consultation">
@@ -196,13 +201,17 @@
<dc:Bounds x="160" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0mj9ddw_di" bpmnElement="Activity_0mj9ddw" isExpanded="true">
<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>
<bpmndi:BPMNShape id="Event_1olxq4s_di" bpmnElement="Event_1olxq4s">
<dc:Bounds x="342" y="382" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0apj1oh_di" bpmnElement="depart_leader_start">
<bpmndi:BPMNShape id="Activity_0apj1oh_di" bpmnElement="depart_leader_start_1">
<dc:Bounds x="430" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
@@ -220,7 +229,7 @@
<dc:Bounds x="890" y="420" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="Activity_1pip97n" isExpanded="true">
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="sub_process_2" isExpanded="true">
<dc:Bounds x="680" y="100" width="660" height="210" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_15afvr9_di" bpmnElement="Event_15afvr9">
@@ -326,9 +335,9 @@
<di:waypoint x="1252" y="570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_14aeapm_di" bpmnElement="Flow_14aeapm">
<di:waypoint x="1090" y="381" />
<di:waypoint x="960" y="385" />
<di:waypoint x="960" y="420" />
<di:waypoint x="1090" y="379" />
<di:waypoint x="940" y="379" />
<di:waypoint x="940" y="420" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
<dc:Bounds x="1560" y="360" width="100" height="80" />
@@ -340,58 +349,62 @@
<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_end_3">
<dc:Bounds x="1780" y="430" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qqp5sb_di" bpmnElement="Activity_0qqp5sb" isExpanded="true">
<dc:Bounds x="1492" y="600" width="528" height="240" />
<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="BPMNShape_00so089" bpmnElement="module_owner_end_3">
<dc:Bounds x="1590" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_035drax" bpmnElement="depart_leader_end_4">
<dc:Bounds x="1730" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
<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="1865" y="695" width="50" height="50" />
<dc:Bounds x="1995" y="695" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07vxc54_di" bpmnElement="Event_07vxc54">
<dc:Bounds x="1952" y="702" width="36" height="36" />
<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>
<bpmndi:BPMNShape id="BPMNShape_19cqaly" bpmnElement="depart_leader_start_2">
<dc:Bounds x="1580" y="680" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1bfoa9n_di" bpmnElement="Flow_1bfoa9n">
<di:waypoint x="1548" y="720" />
<di:waypoint x="1590" y="720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
<di:waypoint x="1690" y="720" />
<di:waypoint x="1730" y="720" />
<di:waypoint x="1820" y="720" />
<di:waypoint x="1860" y="720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
<di:waypoint x="1830" y="720" />
<di:waypoint x="1865" y="720" />
<di:waypoint x="1960" y="720" />
<di:waypoint x="1995" y="720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
<di:waypoint x="1915" y="720" />
<di:waypoint x="1952" y="720" />
<di:waypoint x="2045" y="720" />
<di:waypoint x="2092" y="720" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1923" y="702" width="22" height="14" />
<dc:Bounds x="2058" y="702" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ft2poj_di" bpmnElement="Flow_1ft2poj">
<di:waypoint x="1890" y="695" />
<di:waypoint x="1890" y="630" />
<di:waypoint x="1640" y="630" />
<di:waypoint x="1640" y="680" />
<di:waypoint x="2020" y="695" />
<di:waypoint x="2020" y="630" />
<di:waypoint x="1770" y="630" />
<di:waypoint x="1770" y="680" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1756" y="612" width="21" height="14" />
<dc:Bounds x="1886" y="612" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_07p5ivp_di" bpmnElement="Flow_07p5ivp">
<di:waypoint x="1548" y="720" />
<di:waypoint x="1580" y="720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0q5ae61_di" bpmnElement="Flow_0q5ae61">
<di:waypoint x="1680" y="720" />
<di:waypoint x="1720" y="720" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1d5objw_di" bpmnElement="Flow_1d5objw">
<di:waypoint x="210" y="318" />
<di:waypoint x="210" y="360" />
@@ -417,15 +430,13 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1aeqdsv_di" bpmnElement="Flow_1aeqdsv">
<di:waypoint x="1635" y="520" />
<di:waypoint x="1708" y="520" />
<di:waypoint x="1708" y="470" />
<di:waypoint x="1780" y="470" />
<di:waypoint x="1780" y="520" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1733" y="452" width="21" height="14" />
<dc:Bounds x="1697" y="502" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0g6wwzz_di" bpmnElement="Flow_0g6wwzz">
<di:waypoint x="1830" y="430" />
<di:waypoint x="1830" y="480" />
<di:waypoint x="1830" y="400" />
<di:waypoint x="1660" y="400" />
</bpmndi:BPMNEdge>
@@ -437,10 +448,9 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1f5fu60_di" bpmnElement="Flow_1f5fu60">
<di:waypoint x="1960" y="600" />
<di:waypoint x="1960" y="320" />
<di:waypoint x="1610" y="320" />
<di:waypoint x="1610" y="360" />
<di:waypoint x="2030" y="600" />
<di:waypoint x="2030" y="400" />
<di:waypoint x="1660" y="400" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>