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

update ASMS对接标准拆分字典翻译

Browse Source
This commit is contained in:
liao
2023-11-24 10:41:03 +08:00
parent 5fed9211fd
commit 20eb9aff20
5 changed files with 61 additions and 54 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
-2
View File
@@ -45,6 +45,4 @@ public class ConsultationTaskKey {
public static final String SUB_PROCESS_3 = "sub_process_3"; // 子流程
public static final String SUB_PROCESS_FINISH = "sub_process_finish"; // 一级子流程结束
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+5 -9
View File
@@ -328,17 +328,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后）
case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总
case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总
log.info("{} 汇总", realName);
collect(processInfoVO);
break;
case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
log.info("{} 汇总", realName);
collect(processInfoVO);
Task subTask = taskService.createTaskQuery()
.taskAssignee(CurrentUserUtil.getId())
.taskDefinitionKey(ConsultationTaskKey.SUB_PROCESS_FINISH).singleResult();
taskService.complete(subTask.getId());
log.info("一级子流程最后一个任务id: {}, name: {}", subTask.getId(), subTask.getName());
break;
case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
log.info("模块负责人 {} 分发", realName);
@@ -366,7 +358,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
log.info("还剩 {} 个任务待完成", taskList.size());
log.info("还剩 {} 个执行实例待完成", executionList.size());
taskList.forEach(lastTask -> log.info("任务id: {}", lastTask.getId()));
executionList.forEach(lastExecution -> log.info("执行实例id: {}", lastExecution.getId()));
executionList.forEach(lastExecution -> {
log.info("执行实例id: {}", lastExecution.getId());
log.info("执行实例name: {}", lastExecution.getName());
log.info("执行实例activityId: {}", lastExecution.getActivityId());
});
}
}
laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn
+30 -42
View File
@@ -105,7 +105,7 @@
<bpmn:exclusiveGateway id="Gateway_1xd2kp3">
<bpmn:incoming>Flow_18olfei</bpmn:incoming>
<bpmn:outgoing>Flow_0f48izh</bpmn:outgoing>
<bpmn:outgoing>Flow_065o52n</bpmn:outgoing>
<bpmn:outgoing>Flow_0dy528b</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_18olfei" sourceRef="depart_leader_end_1" targetRef="Gateway_1xd2kp3" />
<bpmn:sequenceFlow id="Flow_0f48izh" name="驳回" sourceRef="Gateway_1xd2kp3" targetRef="module_owner_end_2">
@@ -116,9 +116,8 @@
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_09jjte7</bpmn:incoming>
<bpmn:outgoing>Flow_0qai32h</bpmn:outgoing>
<bpmn:outgoing>Flow_0zrmtql</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0qai32h" sourceRef="depart_leader_collect_2" targetRef="sub_process_finish" />
<bpmn:userTask id="module_owner_end_2" name="模块负责人汇总填写意见（可跳过）" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
@@ -130,21 +129,16 @@
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_14aeapm" sourceRef="module_owner_end_2" targetRef="depart_leader_end_1" />
<bpmn:userTask id="sub_process_finish" name="一级子流程结束" activiti:assignee="${departLeader}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_065o52n</bpmn:incoming>
<bpmn:incoming>Flow_0qai32h</bpmn:incoming>
<bpmn:outgoing>Flow_0mtwkua</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_065o52n" name="通过" sourceRef="Gateway_1xd2kp3" targetRef="sub_process_finish">
<bpmn:endEvent id="Event_1nqj4x3">
<bpmn:incoming>Flow_0dy528b</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0dy528b" name="通过" sourceRef="Gateway_1xd2kp3" targetRef="Event_1nqj4x3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${passSecond}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:endEvent id="Event_0w3bhnu">
<bpmn:incoming>Flow_0mtwkua</bpmn:incoming>
<bpmn:endEvent id="Event_14mnbit">
<bpmn:incoming>Flow_0zrmtql</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0mtwkua" sourceRef="sub_process_finish" targetRef="Event_0w3bhnu" />
<bpmn:sequenceFlow id="Flow_0zrmtql" sourceRef="depart_leader_collect_2" targetRef="Event_14mnbit" />
</bpmn:subProcess>
<bpmn:sequenceFlow id="Flow_0azsibi" sourceRef="engineer_start" targetRef="sub_process_1" />
<bpmn:userTask id="engineer_start_end" name="法规工程师审批" activiti:assignee="${engineer}">
@@ -275,27 +269,15 @@
<dc:Bounds x="560" y="580" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="depart_leader_collect_2">
<dc:Bounds x="790" y="580" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0gcol5c_di" bpmnElement="depart_leader_end_1">
<dc:Bounds x="710" y="340" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_18s4mik" bpmnElement="module_owner_end_2">
<dc:Bounds x="910" y="341" width="100" height="80" />
<bpmndi:BPMNLabel />
<bpmndi:BPMNShape id="Event_1nqj4x3_di" bpmnElement="Event_1nqj4x3">
<dc:Bounds x="1112" y="482" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1xd2kp3_di" bpmnElement="Gateway_1xd2kp3" isMarkerVisible="true">
<dc:Bounds x="935" y="475" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0zan5e4_di" bpmnElement="sub_process_finish">
<dc:Bounds x="1050" y="460" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0w3bhnu_di" bpmnElement="Event_0w3bhnu">
<dc:Bounds x="1222" y="482" width="36" height="36" />
<bpmndi:BPMNShape id="Event_14mnbit_di" bpmnElement="Event_14mnbit">
<dc:Bounds x="1022" y="602" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1pip97n_di" bpmnElement="sub_process_2" isExpanded="true">
<dc:Bounds x="680" y="100" width="660" height="210" />
@@ -334,6 +316,17 @@
<di:waypoint x="1220" y="210" />
<di:waypoint x="1282" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Gateway_1xd2kp3_di" bpmnElement="Gateway_1xd2kp3" isMarkerVisible="true">
<dc:Bounds x="935" y="475" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_1qjvmbo" bpmnElement="depart_leader_collect_2">
<dc:Bounds x="790" y="580" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_18s4mik" bpmnElement="module_owner_end_2">
<dc:Bounds x="910" y="341" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1gv6jmb_di" bpmnElement="Flow_1gv6jmb">
<di:waypoint x="378" y="400" />
<di:waypoint x="430" y="400" />
@@ -377,25 +370,20 @@
<dc:Bounds x="963" y="446" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0qai32h_di" bpmnElement="Flow_0qai32h">
<di:waypoint x="890" y="620" />
<di:waypoint x="1100" y="620" />
<di:waypoint x="1100" y="540" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_14aeapm_di" bpmnElement="Flow_14aeapm">
<di:waypoint x="910" y="380" />
<di:waypoint x="810" y="380" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_065o52n_di" bpmnElement="Flow_065o52n">
<bpmndi:BPMNEdge id="Flow_0dy528b_di" bpmnElement="Flow_0dy528b">
<di:waypoint x="985" y="500" />
<di:waypoint x="1050" y="500" />
<di:waypoint x="1112" y="500" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1007" y="482" width="22" height="14" />
<dc:Bounds x="1038" y="482" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mtwkua_di" bpmnElement="Flow_0mtwkua">
<di:waypoint x="1150" y="500" />
<di:waypoint x="1222" y="500" />
<bpmndi:BPMNEdge id="Flow_0zrmtql_di" bpmnElement="Flow_0zrmtql">
<di:waypoint x="890" y="620" />
<di:waypoint x="1022" y="620" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
<dc:Bounds x="1560" y="360" width="100" height="80" />