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:
lijiarao
2023-12-19 11:43:10 +08:00
parent cc9315743a
commit 34d973f963
4 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+21
View File
@@ -459,11 +459,32 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
break;
//法规工程师归档
case ProcessProjectAssessCommon.FGGCSGD:
fggcsgdSubmit(processInfoVO, processDTO);
break;
default:
}
}
private void fggcsgdSubmit(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO) {
String businessId = processInfoVO.getBusinessId();
ProcessProjectAssess projectAssess = this.getById(businessId);
String projectId = projectAssess.getProjectId();
LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId);
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
sendMessageDTO.setToUserId(carbonCopyPersonnels);
Map<String, String> sendMap = new HashMap<>();
ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId());
sendMap.put("prcNum", process.getPrcNum());
sendMap.put("prcName", process.getPrcName());
sendMap.put("projectName", lawsProjectLibrary.getProjectName());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
}
//各部门主管级领导下发
private void gbmzgjldxfSubmit(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO) {
String businessId = processInfoVO.getBusinessId();
laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
+1
View File
@@ -18,4 +18,5 @@ public class MessageTemplateCodeCommon {
public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更
public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更
public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】
public static final String PROJECT_ASSESS_COMPLETE = "项目合规评估完成提醒"; // 【项目合规评估完成提醒】
}
laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn
+2 -2
View File
@@ -47,7 +47,7 @@
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1d18hwv" name="涉及人员" sourceRef="Gateway_1cgwh2s" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${designEngineerListSize &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrsp" name="模块负责人审批" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
@@ -82,7 +82,7 @@
<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:conditionExpression xsi:type="bpmn:tFormalExpression">${designEngineerListSize == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" activiti:assignee="${moduleOwner}">
<bpmn:extensionElements>
laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn
+56 -56
View File
@@ -47,7 +47,7 @@
</bpmn:multiInstanceLoopCharacteristics>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1d18hwv" name="涉及人员" sourceRef="Gateway_1cgwh2s" targetRef="sjgcspg">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerList.size &gt; 0}</bpmn:conditionExpression>
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${designEngineerListSize &gt; 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrsp" name="模块负责人审批" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
@@ -82,7 +82,7 @@
<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:conditionExpression xsi:type="bpmn:tFormalExpression">${designEngineerListSize == 0}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:userTask id="mkfzrff" name="模块负责人分发" camunda:assignee="${moduleOwner}">
<bpmn:extensionElements>
@@ -158,13 +158,6 @@
<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="590" />
<bpmndi:BPMNLabel />
@@ -175,25 +168,6 @@
<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="300" />
<bpmndi:BPMNLabel />
@@ -201,9 +175,6 @@
<bpmndi:BPMNShape id="Event_1ian0ub_di" bpmnElement="Event_1ian0ub">
<dc:Bounds x="750.3333333333334" y="152" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_02udv1z_di" bpmnElement="mkfzrff">
<dc:Bounds x="830" y="130" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1vb9u4y_di" bpmnElement="sjgcspg">
<dc:Bounds x="990" y="130" width="100" height="80" />
</bpmndi:BPMNShape>
@@ -217,11 +188,14 @@
<bpmndi:BPMNShape id="Event_151o5cu_di" bpmnElement="Event_151o5cu">
<dc:Bounds x="1432" y="152" 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: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 id="Activity_02udv1z_di" bpmnElement="mkfzrff">
<dc:Bounds x="830" y="130" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0xb4gtd_di" bpmnElement="Flow_0xb4gtd">
<di:waypoint x="786" y="170" />
@@ -270,6 +244,25 @@
<dc:Bounds x="868" y="301" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<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="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:BPMNEdge id="Flow_1g6zc95_di" bpmnElement="Flow_1g6zc95">
<di:waypoint x="506" y="165" />
<di:waypoint x="550" y="165" />
@@ -278,29 +271,6 @@
<di:waypoint x="790" y="370" />
<di:waypoint x="790" y="390" />
</bpmndi:BPMNEdge>
<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_0ql7uu4_di" bpmnElement="Flow_0ql7uu4">
<di:waypoint x="625" y="260" />
<di:waypoint x="710" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="646" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<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="588" y="316" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mpm9av_di" bpmnElement="Flow_0mpm9av">
<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" />
@@ -319,6 +289,36 @@
<dc:Bounds x="794" y="538" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mpm9av_di" bpmnElement="Flow_0mpm9av">
<di:waypoint x="1000" y="470" />
<di:waypoint x="1000" y="430" />
<di:waypoint x="840" y="430" />
</bpmndi:BPMNEdge>
<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_0ql7uu4_di" bpmnElement="Flow_0ql7uu4">
<di:waypoint x="625" y="260" />
<di:waypoint x="710" y="260" />
<bpmndi:BPMNLabel>
<dc:Bounds x="646" y="242" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<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="588" y="316" width="55" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<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:BPMNEdge id="Flow_12b9yhd_di" bpmnElement="Flow_12b9yhd">
<di:waypoint x="195" y="190" />
<di:waypoint x="250" y="190" />