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-28 10:21:22 +08:00
parent 157236e323
commit 07d544c179
4 changed files with 73 additions and 62 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
+1 -1
View File
@@ -11,7 +11,7 @@ public class ConsultationTaskKey {
public static final String ENGINEER_START = "engineer_start"; // 法规工程师发起
public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师审批
public static final String ENGINEER_START_END = "engineer_end"; // 法规工程师审批
public static final String REJECT = "reject"; // 驳回
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+14 -3
View File
@@ -242,19 +242,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
ProcessFbConsultationUserLink processFbConsultationUserLink = businessInfoDTO.getProcessFbConsultationUserLink();
List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
if (StringUtils.isBlank(taskId)) { // 流程没有发起时保存
if (StringUtils.isBlank(taskId)) { // 法规工程师发起
saveOrUpdate(processFbStandardConsultation);
processInfoVO.setBusinessId(processFbStandardConsultation.getId());
} else { // 流程发起后保存
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskDefinitionKey = task.getTaskDefinitionKey();
switch (taskDefinitionKey) {
case ConsultationTaskKey.DEPART_LEADER_START_1: // 各部所主管级领导分发
break;
case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人）
case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人）
break;
case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过）
case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后）
case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总
case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总
case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
break;
case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
break;
default:
log.info("保存为草稿，节点 {} 无操作", taskDefinitionKey);
throw new JeroBootException("目前还未开发，请联系管理员");
}
}
processInfoVO.setBusinessId(processFbStandardConsultation.getId());
// 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+3 -3
View File
@@ -304,12 +304,12 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
@Transactional
@Override
public void deleteMyDraft(String taskId) {
LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
if (StringUtils.isNotBlank(taskId)) {
LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
processDraftService.remove(deleteWrapper);
}
processDraftService.remove(deleteWrapper);
}
/**
laws-modules/src/main/resources/bpmn/标准征求意见流程.bpmn
+55 -55
View File
@@ -139,7 +139,7 @@
<bpmn:sequenceFlow id="Flow_17fjaez" sourceRef="depart_leader_collect_2" targetRef="Event_1nqj4x3" />
</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_end" name="法规工程师审批" activiti:assignee="${engineer}">
<bpmn:extensionElements>
<activiti:taskListener class="com.jero.modules.activiti.process.fb.listener.BusinessKeyListener" event="create" />
</bpmn:extensionElements>
@@ -147,13 +147,13 @@
<bpmn:incoming>Flow_06kgad6</bpmn:incoming>
<bpmn:outgoing>Flow_1125yee</bpmn:outgoing>
</bpmn:userTask>
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="sub_process_1" targetRef="engineer_start_end" />
<bpmn:sequenceFlow id="Flow_19vxot3" sourceRef="sub_process_1" targetRef="engineer_end" />
<bpmn:exclusiveGateway id="Gateway_0pd0196">
<bpmn:incoming>Flow_1125yee</bpmn:incoming>
<bpmn:outgoing>Flow_0sb0q1z</bpmn:outgoing>
<bpmn:outgoing>Flow_0jjkrst</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_1125yee" sourceRef="engineer_start_end" targetRef="Gateway_0pd0196" />
<bpmn:sequenceFlow id="Flow_1125yee" sourceRef="engineer_end" targetRef="Gateway_0pd0196" />
<bpmn:endEvent id="Event_07yr7ob">
<bpmn:incoming>Flow_0sb0q1z</bpmn:incoming>
</bpmn:endEvent>
@@ -236,7 +236,7 @@
<bpmn:sequenceFlow id="Flow_0jjkrst" name="驳回" sourceRef="Gateway_0pd0196" targetRef="sub_process_3">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!passThird}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_06kgad6" sourceRef="sub_process_3" targetRef="engineer_start_end" />
<bpmn:sequenceFlow id="Flow_06kgad6" sourceRef="sub_process_3" targetRef="engineer_end" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="fb-standard-consultation">
@@ -247,16 +247,6 @@
<dc:Bounds x="160" y="360" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
<dc:Bounds x="1525" y="225" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
<dc:Bounds x="1662" y="232" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_start_end">
<dc:Bounds x="1250" y="210" 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="880" height="690" />
</bpmndi:BPMNShape>
@@ -281,20 +271,6 @@
<dc:Bounds x="710" y="340" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<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="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:BPMNShape id="Activity_1pip97n_di" bpmnElement="sub_process_2" isExpanded="true">
<dc:Bounds x="430" y="70" width="660" height="210" />
</bpmndi:BPMNShape>
@@ -332,6 +308,20 @@
<di:waypoint x="970" y="180" />
<di:waypoint x="1032" y="180" />
</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:BPMNShape id="Event_1nqj4x3_di" bpmnElement="Event_1nqj4x3">
<dc:Bounds x="1112" y="482" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1gv6jmb_di" bpmnElement="Flow_1gv6jmb">
<di:waypoint x="378" y="400" />
<di:waypoint x="430" y="400" />
@@ -390,6 +380,16 @@
<di:waypoint x="1130" y="620" />
<di:waypoint x="1130" y="518" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Activity_1th4kyn_di" bpmnElement="engineer_end">
<dc:Bounds x="1250" y="210" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0pd0196_di" bpmnElement="Gateway_0pd0196" isMarkerVisible="true">
<dc:Bounds x="1525" y="225" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_07yr7ob_di" bpmnElement="Event_07yr7ob">
<dc:Bounds x="1662" y="232" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0qqp5sb_di" bpmnElement="sub_process_3" isExpanded="true">
<dc:Bounds x="1240" y="350" width="838" height="310" />
</bpmndi:BPMNShape>
@@ -421,9 +421,20 @@
<dc:Bounds x="1578" y="530" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_07p5ivp_di" bpmnElement="Flow_07p5ivp">
<di:waypoint x="1296" y="470" />
<di:waypoint x="1328" y="470" />
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
<di:waypoint x="1678" y="470" />
<di:waypoint x="1748" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
<di:waypoint x="1848" y="470" />
<di:waypoint x="1913" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
<di:waypoint x="1963" y="470" />
<di:waypoint x="2010" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1972" y="452" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ft2poj_di" bpmnElement="Flow_1ft2poj">
<di:waypoint x="1938" y="445" />
@@ -434,6 +445,14 @@
<dc:Bounds x="1774" y="362" width="22" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_07p5ivp_di" bpmnElement="Flow_07p5ivp">
<di:waypoint x="1296" y="470" />
<di:waypoint x="1328" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ybap2u_di" bpmnElement="Flow_1ybap2u">
<di:waypoint x="1428" y="470" />
<di:waypoint x="1473" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1vn8jk5_di" bpmnElement="Flow_1vn8jk5">
<di:waypoint x="1523" y="470" />
<di:waypoint x="1578" y="470" />
@@ -441,30 +460,6 @@
<dc:Bounds x="1540" y="452" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mdmcs5_di" bpmnElement="Flow_0mdmcs5">
<di:waypoint x="1678" y="470" />
<di:waypoint x="1748" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0flbibd_di" bpmnElement="Flow_0flbibd">
<di:waypoint x="1848" y="470" />
<di:waypoint x="1913" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132k5wt_di" bpmnElement="Flow_132k5wt">
<di:waypoint x="1678" y="570" />
<di:waypoint x="1938" y="570" />
<di:waypoint x="1938" y="495" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ta4894_di" bpmnElement="Flow_1ta4894">
<di:waypoint x="1963" y="470" />
<di:waypoint x="2010" y="470" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1972" y="452" width="23" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ybap2u_di" bpmnElement="Flow_1ybap2u">
<di:waypoint x="1428" y="470" />
<di:waypoint x="1473" y="470" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1tg5cq9_di" bpmnElement="Flow_1tg5cq9">
<di:waypoint x="1498" y="495" />
<di:waypoint x="1498" y="570" />
@@ -473,6 +468,11 @@
<dc:Bounds x="1511" y="530" width="34" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_132k5wt_di" bpmnElement="Flow_132k5wt">
<di:waypoint x="1678" y="570" />
<di:waypoint x="1938" y="570" />
<di:waypoint x="1938" y="495" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1d5objw_di" bpmnElement="Flow_1d5objw">
<di:waypoint x="210" y="318" />
<di:waypoint x="210" y="360" />