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

update 项目合规评估流程 增加全部不涉及分支，bug修改

Browse Source
This commit is contained in:
lijiarao
2023-12-18 18:26:19 +08:00
parent fa1ad604ee
commit fb3f5465b3
6 changed files with 275 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+3 -1
View File
@@ -503,7 +503,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
link.setUserId(userId);
linkList.add(link);
});
processNodeLinkService.saveBatch(linkList, linkList.size());
if (!linkList.isEmpty()){
processNodeLinkService.saveBatch(linkList, linkList.size());
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
+2
View File
@@ -8,7 +8,9 @@ public class ProcessProjectAssessCommon {
public static final String STANDARDS_ENGINEER = "standardsEngineer";
public static final String MANAGER_LEADER_LIST = "managerLeaderList";
public static final String MODULE_OWNER_LIST = "moduleOwnerList";
public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize";
public static final String DESIGN_ENGINEER_LIST = "designEngineerList";
public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize";
public static final String PASS = "pass";
public static final String EXECUTION_ID = "executionId";
//法规工程师发起
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+3 -10
View File
@@ -225,6 +225,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
}
ProcessProjectAssessTermUser termUser = termUsers.get(0);
term.setNotInvolved(termUser.getNotInvolved());
term.setEvaluationFeedback(termUser.getEvaluationFeedback());
term.setEvaluationFeedback_dictText(termUser.getEvaluationFeedback_dictText());
term.setDescription(termUser.getDescription());
@@ -398,7 +399,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
// 完成任务
String taskId = processDTO.getTaskId();
runtimeService.setVariable(task.getProcessInstanceId(), "moduleOwner", CurrentUserUtil.getId());
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
taskService.complete(taskId, variables);
@@ -510,9 +510,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
if (moduleOwnerIds.isEmpty()) {
throw new JeroBootException(ResultCommon.ProjectAssess);
}
moduleOwnerIds = moduleOwnerIds.stream().distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, moduleOwnerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -520,6 +517,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerIds);
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size());
taskService.complete(taskId, variables);
}
@@ -585,9 +583,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
if (designEngineerIds.isEmpty()) {
throw new JeroBootException(ResultCommon.ProjectAssess);
}
designEngineerIds = designEngineerIds.stream().distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, designEngineerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -595,6 +590,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerIds);
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size());
taskService.complete(taskId, variables);
}
@@ -620,9 +616,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
allTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(allTermUserList);
ProcessProjectAssessTermUser byId = processProjectAssessTermUserService.getById(allTermUserList.get(0).getId());
runtimeService.setVariable(task.getProcessInstanceId(), "moduleOwner", byId.getModuleOwner());
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) {
LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.NO.getInteger());
//wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
List<ProcessProjectAssessTerm> list = this.list(wrapper);
return list;
}
laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn
+133 -62
View File
@@ -22,11 +22,11 @@
<bpmn:sequenceFlow id="Flow_1g6zc95" sourceRef="Event_1azjojy" targetRef="gbmzgjldxf" />
<bpmn:userTask id="gbmzgjldxf" name="各部门主管级领导下发" activiti:assignee="${managerLeader}">
<bpmn:incoming>Flow_1g6zc95</bpmn:incoming>
<bpmn:outgoing>Flow_168zkyq</bpmn:outgoing>
<bpmn:outgoing>Flow_01dzmhe</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_168zkyq" sourceRef="gbmzgjldxf" targetRef="Activity_08c4m85" />
<bpmn:subProcess id="Activity_08c4m85">
<bpmn:incoming>Flow_168zkyq</bpmn:incoming>
<bpmn:subProcess id="Activity_08c4m85" name="模块负责人下发子流程">
<bpmn:extensionElements />
<bpmn:incoming>Flow_0ql7uu4</bpmn:incoming>
<bpmn:outgoing>Flow_1o0npc9</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics activiti:collection="moduleOwnerList" activiti:elementVariable="moduleOwner">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances == nrOfCompletedInstances}</bpmn:completionCondition>
@@ -34,13 +34,6 @@
<bpmn:startEvent id="Event_1ian0ub">
<bpmn:outgoing>Flow_0xb4gtd</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0xb4gtd</bpmn:incoming>
<bpmn:outgoing>Flow_1d18hwv</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0xb4gtd" sourceRef="Event_1ian0ub" targetRef="mkfzrff" />
<bpmn:userTask id="sjgcspg" name="设计工程师评估" activiti:assignee="${designEngineer}">
<bpmn:extensionElements>
@@ -53,7 +46,9 @@
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances == nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1d18hwv" sourceRef="mkfzrff" targetRef="sjgcspg" />
<bpmn:sequenceFlow id="Flow_1d18hwv" name="涉及人员" sourceRef="Gateway_1cgwh2s" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrsp" name="模块负责人审批" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
@@ -77,6 +72,25 @@
<bpmn:sequenceFlow id="Flow_07hxwn8" name="驳回" sourceRef="Gateway_1vkxod2" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:exclusiveGateway id="Gateway_1cgwh2s">
<bpmn:incoming>Flow_0cx9yoz</bpmn:incoming>
<bpmn:outgoing>Flow_1g6f2ww</bpmn:outgoing>
<bpmn:outgoing>Flow_1d18hwv</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_0cx9yoz" sourceRef="mkfzrff" targetRef="Gateway_1cgwh2s" />
<bpmn:endEvent id="Event_1r9lnkl">
<bpmn:incoming>Flow_1g6f2ww</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_1g6f2ww" name="全部不涉及" sourceRef="Gateway_1cgwh2s" targetRef="Event_1r9lnkl">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0xb4gtd</bpmn:incoming>
<bpmn:outgoing>Flow_0cx9yoz</bpmn:outgoing>
</bpmn:userTask>
</bpmn:subProcess>
<bpmn:userTask id="gbmzgjldsp" name="各部门主管级领导（汇总）审批" activiti:assignee="${managerLeader}">
<bpmn:incoming>Flow_1o0npc9</bpmn:incoming>
@@ -102,14 +116,29 @@
<bpmn:sequenceFlow id="Flow_0mpm9av" sourceRef="mkfzrxg" targetRef="gbmzgjldsp" />
<bpmn:userTask id="mkfzrxg" name="模块负责人修改" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_11i64js</bpmn:incoming>
<bpmn:outgoing>Flow_0mpm9av</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:exclusiveGateway id="Gateway_0r2qm3p">
<bpmn:incoming>Flow_01dzmhe</bpmn:incoming>
<bpmn:outgoing>Flow_0ql7uu4</bpmn:outgoing>
<bpmn:outgoing>Flow_15xpnyd</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_01dzmhe" sourceRef="gbmzgjldxf" targetRef="Gateway_0r2qm3p" />
<bpmn:sequenceFlow id="Flow_0ql7uu4" name="涉及人员" sourceRef="Gateway_0r2qm3p" targetRef="Activity_08c4m85">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:endEvent id="Event_1e8jif7">
<bpmn:incoming>Flow_15xpnyd</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_15xpnyd" name="全部不涉及" sourceRef="Gateway_0r2qm3p" targetRef="Event_1e8jif7">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
</bpmn:subProcess>
<bpmn:userTask id="fggcsgd" name="法规工程师归档" activiti:assignee="${standardsEngineer}">
<bpmn:incoming>Flow_0w3nr57</bpmn:incoming>
@@ -129,8 +158,15 @@
<bpmndi:BPMNShape id="Activity_03wwtxl_di" bpmnElement="fggcsfq">
<dc:Bounds x="250" y="150" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_1uw77uz" bpmnElement="fggcsgd">
<dc:Bounds x="750" y="690" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nxyypv_di" bpmnElement="Event_0nxyypv">
<dc:Bounds x="882" y="712" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0z0ilv7_di" bpmnElement="Activity_1wp96uu" isExpanded="true">
<dc:Bounds x="430" y="40" width="1110" height="560" />
<dc:Bounds x="430" y="40" width="1110" height="590" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1azjojy_di" bpmnElement="Event_1azjojy">
@@ -139,8 +175,28 @@
<bpmndi:BPMNShape id="Activity_0x09ket_di" bpmnElement="gbmzgjldxf">
<dc:Bounds x="550" y="125" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0r2qm3p_di" bpmnElement="Gateway_0r2qm3p" isMarkerVisible="true">
<dc:Bounds x="575" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1e8jif7_di" bpmnElement="Event_1e8jif7">
<dc:Bounds x="582" y="352" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_155ubeu" bpmnElement="gbmzgjldsp">
<dc:Bounds x="740" y="390" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1qktq5f_di" bpmnElement="Gateway_1qktq5f" isMarkerVisible="true">
<dc:Bounds x="765" y="485" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_17bnh8x_di" bpmnElement="Event_17bnh8x">
<dc:Bounds x="772" y="562" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0p7dxnt_di" bpmnElement="mkfzrxg">
<dc:Bounds x="950" y="470" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0njknr1_di" bpmnElement="Activity_08c4m85" isExpanded="true">
<dc:Bounds x="710" y="70" width="790" height="190" />
<dc:Bounds x="710" y="70" width="790" height="300" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1ian0ub_di" bpmnElement="Event_1ian0ub">
<dc:Bounds x="750.3333333333334" y="152" width="36" height="36" />
@@ -161,13 +217,23 @@
<bpmndi:BPMNShape id="Event_151o5cu_di" bpmnElement="Event_151o5cu">
<dc:Bounds x="1432" y="152" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1r9lnkl_di" bpmnElement="Event_1r9lnkl">
<dc:Bounds x="862" y="322" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1cgwh2s_di" bpmnElement="Gateway_1cgwh2s" isMarkerVisible="true">
<dc:Bounds x="855" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0xb4gtd_di" bpmnElement="Flow_0xb4gtd">
<di:waypoint x="786" y="170" />
<di:waypoint x="830" y="170" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1d18hwv_di" bpmnElement="Flow_1d18hwv">
<di:waypoint x="930" y="170" />
<di:waypoint x="990" y="170" />
<di:waypoint x="905" y="260" />
<di:waypoint x="1040" y="260" />
<di:waypoint x="1040" y="210" />
<bpmndi:BPMNLabel>
<dc:Bounds x="951" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_09f92lr_di" bpmnElement="Flow_09f92lr">
<di:waypoint x="1090" y="170" />
@@ -193,61 +259,66 @@
<dc:Bounds x="1180" y="72" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_155ubeu" bpmnElement="gbmzgjldsp">
<dc:Bounds x="730" y="330" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1qktq5f_di" bpmnElement="Gateway_1qktq5f" isMarkerVisible="true">
<dc:Bounds x="755" y="445" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_17bnh8x_di" bpmnElement="Event_17bnh8x">
<dc:Bounds x="762" y="542" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0p7dxnt_di" bpmnElement="mkfzrxg">
<dc:Bounds x="920" y="430" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0cx9yoz_di" bpmnElement="Flow_0cx9yoz">
<di:waypoint x="880" y="210" />
<di:waypoint x="880" y="235" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1g6f2ww_di" bpmnElement="Flow_1g6f2ww">
<di:waypoint x="880" y="285" />
<di:waypoint x="880" y="322" />
<bpmndi:BPMNLabel>
<dc:Bounds x="868" y="301" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1g6zc95_di" bpmnElement="Flow_1g6zc95">
<di:waypoint x="506" y="165" />
<di:waypoint x="550" y="165" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_168zkyq_di" bpmnElement="Flow_168zkyq">
<di:waypoint x="650" y="165" />
<di:waypoint x="710" y="165" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1o0npc9_di" bpmnElement="Flow_1o0npc9">
<di:waypoint x="780" y="260" />
<di:waypoint x="780" y="330" />
<di:waypoint x="790" y="370" />
<di:waypoint x="790" y="390" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10o9sl2_di" bpmnElement="Flow_10o9sl2">
<di:waypoint x="780" y="410" />
<di:waypoint x="780" y="445" />
<bpmndi:BPMNEdge id="Flow_01dzmhe_di" bpmnElement="Flow_01dzmhe">
<di:waypoint x="600" y="205" />
<di:waypoint x="600" y="235" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_11i64js_di" bpmnElement="Flow_11i64js">
<di:waypoint x="805" y="470" />
<di:waypoint x="920" y="470" />
<bpmndi:BPMNEdge id="Flow_0ql7uu4_di" bpmnElement="Flow_0ql7uu4">
<di:waypoint x="625" y="260" />
<di:waypoint x="710" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="849" y="458" width="21" height="14" />
<dc:Bounds x="646" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132fp4x_di" bpmnElement="Flow_132fp4x">
<di:waypoint x="780" y="495" />
<di:waypoint x="780" y="542" />
<bpmndi:BPMNEdge id="Flow_15xpnyd_di" bpmnElement="Flow_15xpnyd">
<di:waypoint x="600" y="285" />
<di:waypoint x="600" y="352" />
<bpmndi:BPMNLabel>
<dc:Bounds x="784" y="503" width="22" height="14" />
<dc:Bounds x="588" y="316" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mpm9av_di" bpmnElement="Flow_0mpm9av">
<di:waypoint x="970" y="430" />
<di:waypoint x="970" y="370" />
<di:waypoint x="830" y="370" />
<di:waypoint x="1000" y="470" />
<di:waypoint x="1000" y="430" />
<di:waypoint x="840" y="430" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10o9sl2_di" bpmnElement="Flow_10o9sl2">
<di:waypoint x="790" y="470" />
<di:waypoint x="790" y="485" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_11i64js_di" bpmnElement="Flow_11i64js">
<di:waypoint x="815" y="510" />
<di:waypoint x="950" y="510" />
<bpmndi:BPMNLabel>
<dc:Bounds x="869" y="498" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132fp4x_di" bpmnElement="Flow_132fp4x">
<di:waypoint x="790" y="535" />
<di:waypoint x="790" y="562" />
<bpmndi:BPMNLabel>
<dc:Bounds x="794" y="538" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_1uw77uz" bpmnElement="fggcsgd">
<dc:Bounds x="750" y="640" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nxyypv_di" bpmnElement="Event_0nxyypv">
<dc:Bounds x="882" y="662" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_12b9yhd_di" bpmnElement="Flow_12b9yhd">
<di:waypoint x="195" y="190" />
<di:waypoint x="250" y="190" />
@@ -257,12 +328,12 @@
<di:waypoint x="430" y="190" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0w3nr57_di" bpmnElement="Flow_0w3nr57">
<di:waypoint x="800" y="600" />
<di:waypoint x="800" y="640" />
<di:waypoint x="800" y="630" />
<di:waypoint x="800" y="690" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_14lgswg_di" bpmnElement="Flow_14lgswg">
<di:waypoint x="850" y="680" />
<di:waypoint x="882" y="680" />
<di:waypoint x="850" y="730" />
<di:waypoint x="882" y="730" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn
+133 -62
View File
@@ -22,11 +22,11 @@
<bpmn:sequenceFlow id="Flow_1g6zc95" sourceRef="Event_1azjojy" targetRef="gbmzgjldxf" />
<bpmn:userTask id="gbmzgjldxf" name="各部门主管级领导下发" camunda:assignee="${managerLeader}">
<bpmn:incoming>Flow_1g6zc95</bpmn:incoming>
<bpmn:outgoing>Flow_168zkyq</bpmn:outgoing>
<bpmn:outgoing>Flow_01dzmhe</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_168zkyq" sourceRef="gbmzgjldxf" targetRef="Activity_08c4m85" />
<bpmn:subProcess id="Activity_08c4m85">
<bpmn:incoming>Flow_168zkyq</bpmn:incoming>
<bpmn:subProcess id="Activity_08c4m85" name="模块负责人下发子流程">
<bpmn:extensionElements />
<bpmn:incoming>Flow_0ql7uu4</bpmn:incoming>
<bpmn:outgoing>Flow_1o0npc9</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics camunda:collection="moduleOwnerList" camunda:elementVariable="moduleOwner">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances == nrOfCompletedInstances}</bpmn:completionCondition>
@@ -34,13 +34,6 @@
<bpmn:startEvent id="Event_1ian0ub">
<bpmn:outgoing>Flow_0xb4gtd</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
<camunda:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0xb4gtd</bpmn:incoming>
<bpmn:outgoing>Flow_1d18hwv</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_0xb4gtd" sourceRef="Event_1ian0ub" targetRef="mkfzrff" />
<bpmn:userTask id="sjgcspg" name="设计工程师评估" camunda:assignee="${designEngineer}">
<bpmn:extensionElements>
@@ -53,7 +46,9 @@
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances == nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1d18hwv" sourceRef="mkfzrff" targetRef="sjgcspg" />
<bpmn:sequenceFlow id="Flow_1d18hwv" name="涉及人员" sourceRef="Gateway_1cgwh2s" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerList.size &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrsp" name="模块负责人审批" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
<camunda:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
@@ -77,6 +72,25 @@
<bpmn:sequenceFlow id="Flow_07hxwn8" name="驳回" sourceRef="Gateway_1vkxod2" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:exclusiveGateway id="Gateway_1cgwh2s">
<bpmn:incoming>Flow_0cx9yoz</bpmn:incoming>
<bpmn:outgoing>Flow_1g6f2ww</bpmn:outgoing>
<bpmn:outgoing>Flow_1d18hwv</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_0cx9yoz" sourceRef="mkfzrff" targetRef="Gateway_1cgwh2s" />
<bpmn:endEvent id="Event_1r9lnkl">
<bpmn:incoming>Flow_1g6f2ww</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_1g6f2ww" name="全部不涉及" sourceRef="Gateway_1cgwh2s" targetRef="Event_1r9lnkl">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerList.size == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
<camunda:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_0xb4gtd</bpmn:incoming>
<bpmn:outgoing>Flow_0cx9yoz</bpmn:outgoing>
</bpmn:userTask>
</bpmn:subProcess>
<bpmn:userTask id="gbmzgjldsp" name="各部门主管级领导（汇总）审批" camunda:assignee="${managerLeader}">
<bpmn:incoming>Flow_1o0npc9</bpmn:incoming>
@@ -102,14 +116,29 @@
<bpmn:sequenceFlow id="Flow_0mpm9av" sourceRef="mkfzrxg" targetRef="gbmzgjldsp" />
<bpmn:userTask id="mkfzrxg" name="模块负责人修改" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
<camunda:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<camunda:taskListener class="com.jero.modules.activiti.process.projectassess.listener.ProcessProjectAssessCreateListener" event="create" />
</bpmn:extensionElements>
<bpmn:incoming>Flow_11i64js</bpmn:incoming>
<bpmn:outgoing>Flow_0mpm9av</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics camunda:collection="moduleOwnerList" camunda:elementVariable="moduleOwner">
<bpmn:completionCondition xsi:type="bpmn:tFormalExpression">${nrOfInstances == nrOfCompletedInstances}</bpmn:completionCondition>
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:exclusiveGateway id="Gateway_0r2qm3p">
<bpmn:incoming>Flow_01dzmhe</bpmn:incoming>
<bpmn:outgoing>Flow_0ql7uu4</bpmn:outgoing>
<bpmn:outgoing>Flow_15xpnyd</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_01dzmhe" sourceRef="gbmzgjldxf" targetRef="Gateway_0r2qm3p" />
<bpmn:sequenceFlow id="Flow_0ql7uu4" name="涉及人员" sourceRef="Gateway_0r2qm3p" targetRef="Activity_08c4m85">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerList.size &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:endEvent id="Event_1e8jif7">
<bpmn:incoming>Flow_15xpnyd</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_15xpnyd" name="全部不涉及" sourceRef="Gateway_0r2qm3p" targetRef="Event_1e8jif7">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerList.size == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
</bpmn:subProcess>
<bpmn:userTask id="fggcsgd" name="法规工程师归档" camunda:assignee="${standardsEngineer}">
<bpmn:incoming>Flow_0w3nr57</bpmn:incoming>
@@ -129,8 +158,15 @@
<bpmndi:BPMNShape id="Activity_03wwtxl_di" bpmnElement="fggcsfq">
<dc:Bounds x="250" y="150" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_1uw77uz" bpmnElement="fggcsgd">
<dc:Bounds x="750" y="690" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nxyypv_di" bpmnElement="Event_0nxyypv">
<dc:Bounds x="882" y="712" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0z0ilv7_di" bpmnElement="Activity_1wp96uu" isExpanded="true">
<dc:Bounds x="430" y="40" width="1110" height="560" />
<dc:Bounds x="430" y="40" width="1110" height="590" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1azjojy_di" bpmnElement="Event_1azjojy">
@@ -139,8 +175,28 @@
<bpmndi:BPMNShape id="Activity_0x09ket_di" bpmnElement="gbmzgjldxf">
<dc:Bounds x="550" y="125" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0r2qm3p_di" bpmnElement="Gateway_0r2qm3p" isMarkerVisible="true">
<dc:Bounds x="575" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1e8jif7_di" bpmnElement="Event_1e8jif7">
<dc:Bounds x="582" y="352" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_155ubeu" bpmnElement="gbmzgjldsp">
<dc:Bounds x="740" y="390" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1qktq5f_di" bpmnElement="Gateway_1qktq5f" isMarkerVisible="true">
<dc:Bounds x="765" y="485" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_17bnh8x_di" bpmnElement="Event_17bnh8x">
<dc:Bounds x="772" y="562" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0p7dxnt_di" bpmnElement="mkfzrxg">
<dc:Bounds x="950" y="470" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0njknr1_di" bpmnElement="Activity_08c4m85" isExpanded="true">
<dc:Bounds x="710" y="70" width="790" height="190" />
<dc:Bounds x="710" y="70" width="790" height="300" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1ian0ub_di" bpmnElement="Event_1ian0ub">
<dc:Bounds x="750.3333333333334" y="152" width="36" height="36" />
@@ -161,13 +217,23 @@
<bpmndi:BPMNShape id="Event_151o5cu_di" bpmnElement="Event_151o5cu">
<dc:Bounds x="1432" y="152" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1r9lnkl_di" bpmnElement="Event_1r9lnkl">
<dc:Bounds x="862" y="322" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1cgwh2s_di" bpmnElement="Gateway_1cgwh2s" isMarkerVisible="true">
<dc:Bounds x="855" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0xb4gtd_di" bpmnElement="Flow_0xb4gtd">
<di:waypoint x="786" y="170" />
<di:waypoint x="830" y="170" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1d18hwv_di" bpmnElement="Flow_1d18hwv">
<di:waypoint x="930" y="170" />
<di:waypoint x="990" y="170" />
<di:waypoint x="905" y="260" />
<di:waypoint x="1040" y="260" />
<di:waypoint x="1040" y="210" />
<bpmndi:BPMNLabel>
<dc:Bounds x="951" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_09f92lr_di" bpmnElement="Flow_09f92lr">
<di:waypoint x="1090" y="170" />
@@ -193,61 +259,66 @@
<dc:Bounds x="1180" y="72" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_155ubeu" bpmnElement="gbmzgjldsp">
<dc:Bounds x="730" y="330" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_1qktq5f_di" bpmnElement="Gateway_1qktq5f" isMarkerVisible="true">
<dc:Bounds x="755" y="445" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_17bnh8x_di" bpmnElement="Event_17bnh8x">
<dc:Bounds x="762" y="542" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0p7dxnt_di" bpmnElement="mkfzrxg">
<dc:Bounds x="920" y="430" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0cx9yoz_di" bpmnElement="Flow_0cx9yoz">
<di:waypoint x="880" y="210" />
<di:waypoint x="880" y="235" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1g6f2ww_di" bpmnElement="Flow_1g6f2ww">
<di:waypoint x="880" y="285" />
<di:waypoint x="880" y="322" />
<bpmndi:BPMNLabel>
<dc:Bounds x="868" y="301" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1g6zc95_di" bpmnElement="Flow_1g6zc95">
<di:waypoint x="506" y="165" />
<di:waypoint x="550" y="165" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_168zkyq_di" bpmnElement="Flow_168zkyq">
<di:waypoint x="650" y="165" />
<di:waypoint x="710" y="165" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1o0npc9_di" bpmnElement="Flow_1o0npc9">
<di:waypoint x="780" y="260" />
<di:waypoint x="780" y="330" />
<di:waypoint x="790" y="370" />
<di:waypoint x="790" y="390" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10o9sl2_di" bpmnElement="Flow_10o9sl2">
<di:waypoint x="780" y="410" />
<di:waypoint x="780" y="445" />
<bpmndi:BPMNEdge id="Flow_01dzmhe_di" bpmnElement="Flow_01dzmhe">
<di:waypoint x="600" y="205" />
<di:waypoint x="600" y="235" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_11i64js_di" bpmnElement="Flow_11i64js">
<di:waypoint x="805" y="470" />
<di:waypoint x="920" y="470" />
<bpmndi:BPMNEdge id="Flow_0ql7uu4_di" bpmnElement="Flow_0ql7uu4">
<di:waypoint x="625" y="260" />
<di:waypoint x="710" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="849" y="458" width="21" height="14" />
<dc:Bounds x="646" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132fp4x_di" bpmnElement="Flow_132fp4x">
<di:waypoint x="780" y="495" />
<di:waypoint x="780" y="542" />
<bpmndi:BPMNEdge id="Flow_15xpnyd_di" bpmnElement="Flow_15xpnyd">
<di:waypoint x="600" y="285" />
<di:waypoint x="600" y="352" />
<bpmndi:BPMNLabel>
<dc:Bounds x="784" y="503" width="22" height="14" />
<dc:Bounds x="588" y="316" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mpm9av_di" bpmnElement="Flow_0mpm9av">
<di:waypoint x="970" y="430" />
<di:waypoint x="970" y="370" />
<di:waypoint x="830" y="370" />
<di:waypoint x="1000" y="470" />
<di:waypoint x="1000" y="430" />
<di:waypoint x="840" y="430" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10o9sl2_di" bpmnElement="Flow_10o9sl2">
<di:waypoint x="790" y="470" />
<di:waypoint x="790" y="485" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_11i64js_di" bpmnElement="Flow_11i64js">
<di:waypoint x="815" y="510" />
<di:waypoint x="950" y="510" />
<bpmndi:BPMNLabel>
<dc:Bounds x="869" y="498" width="21" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132fp4x_di" bpmnElement="Flow_132fp4x">
<di:waypoint x="790" y="535" />
<di:waypoint x="790" y="562" />
<bpmndi:BPMNLabel>
<dc:Bounds x="794" y="538" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_1uw77uz" bpmnElement="fggcsgd">
<dc:Bounds x="750" y="640" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nxyypv_di" bpmnElement="Event_0nxyypv">
<dc:Bounds x="882" y="662" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_12b9yhd_di" bpmnElement="Flow_12b9yhd">
<di:waypoint x="195" y="190" />
<di:waypoint x="250" y="190" />
@@ -257,12 +328,12 @@
<di:waypoint x="430" y="190" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0w3nr57_di" bpmnElement="Flow_0w3nr57">
<di:waypoint x="800" y="600" />
<di:waypoint x="800" y="640" />
<di:waypoint x="800" y="630" />
<di:waypoint x="800" y="690" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_14lgswg_di" bpmnElement="Flow_14lgswg">
<di:waypoint x="850" y="680" />
<di:waypoint x="882" y="680" />
<di:waypoint x="850" y="730" />
<di:waypoint x="882" y="730" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>