From 9b3c5c304a2af98f7eb77dd961a9d1233bdd6476 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 21:43:12 +0800
Subject: [PATCH] 1、自行受理bug修复 2、流程进度展示bug修复
---
dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml | 44 ++++----
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 173 ++++++++++++++++------------------
dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml | 12 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WebCaseFlowDTO.java | 15 ++-
4 files changed, 119 insertions(+), 125 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WebCaseFlowDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WebCaseFlowDTO.java
index 69a274c..edd8ee6 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WebCaseFlowDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/WebCaseFlowDTO.java
@@ -20,11 +20,6 @@
public class WebCaseFlowDTO {
/**
- * 流程进度名称
- */
- private String processName;
-
- /**
* 流程节点名称
*/
private String nodeShowName;
@@ -60,6 +55,16 @@
private String auditResultName;
/**
+ * 化解结果
+ */
+ private String mediResult;
+
+ /**
+ * 化解结果名称
+ */
+ private String mediResultName;
+
+ /**
* 任务类型，1：正常流转，2：回退申请，3：上报申请
*/
private Integer taskType;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 6b23d49..776d69a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -401,7 +401,6 @@
}else {
lfdj.setNodeShowName(caseInfo.getCanalName());
lfdj.setHandleUnitName(caseInfo.getInputUserName()+"（当事人）");
- lfdj.setHandleUserName(caseInfo.getInputUserName());
}
lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
lfdj.setStatus(CaseTaskConsts.TASK_STATUS_2);
@@ -411,106 +410,96 @@
QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("id");
List<CaseTask> handleCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
-
for (CaseTask caseTask: handleCaseTaskList){
- WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
- webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
- }else{
- webCaseFlowDTO.setProcessName(caseInfo.getProcessName());
+ // 已结束节点
+ if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
+ // 待受理节点，需要加多一个签收节点
+ if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
+ WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
+ slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ slWebCaseFlowDTO.setHandleNotes("已签收");
+ slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ handleCaseFlowList.add(slWebCaseFlowDTO);
}
- webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- webCaseFlowDTO.setTaskType(caseTask.getTaskType());
- webCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
+ // 回退审核节点，需要加多一个回退申请节点
+ if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
+ WebCaseFlowDTO sqWebCaseFlowDTO = new WebCaseFlowDTO();
+ sqWebCaseFlowDTO.setNodeShowName("事件回退");
+ sqWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ sqWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ sqWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ sqWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ sqWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ CaseReturn caseReturn = caseReturnService.getByCaseTaskId(caseTask.getId());
+ sqWebCaseFlowDTO.setHandleNotes("回退理由："+caseReturn.getReturnContent());
+ handleCaseFlowList.add(sqWebCaseFlowDTO);
+ }
+ // 上报审核节点，需要加多一个上报申请节点
+ if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())){
+ WebCaseFlowDTO sqWebCaseFlowDTO = new WebCaseFlowDTO();
+ sqWebCaseFlowDTO.setNodeShowName("事件上报");
+ sqWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ sqWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ sqWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ sqWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_3);
+ sqWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ CaseAppear caseAppear = caseAppearService.getByCaseTaskId(caseTask.getId());
+ sqWebCaseFlowDTO.setHandleNotes("上报意见："+caseAppear.getAppearContent());
+ handleCaseFlowList.add(sqWebCaseFlowDTO);
+ }
+ // 普通节点
+ WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ webCaseFlowDTO.setStatus(caseTask.getStatus());
webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
webCaseFlowDTO.setTaskType(caseTask.getTaskType());
- // todo 审核不通过、通过的展示，有调解结果的
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
-
- }
- if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
-
- }
- webCaseFlowDTO.setStatus(caseTask.getStatus());
- }
- handleCaseFlowList.add(webCaseFlowDTO);
- // 待受理节点，已签收的并处理完，需要加多一个受理节点
- if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
- || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
- || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())){
- if(CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus()
- && CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
- WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
- slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- slWebCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
- }else{
- slWebCaseFlowDTO.setProcessName(caseInfo.getProcessName());
- }
- slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- slWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
- slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
- slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
- slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- slWebCaseFlowDTO.setHandleNotes("已受理");
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
- slWebCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
- slWebCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
- slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- }
- if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
- slWebCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
- slWebCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
- slWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
- }
- slWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }
- handleCaseFlowList.add(slWebCaseFlowDTO);
- }
- }
-
- // 办理反馈节点，加上化解结果
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_BLFK.getIndex())){
- WebCaseFlowDTO blfkWebCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
- blfkWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- blfkWebCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
- }else{
- blfkWebCaseFlowDTO.setProcessName(caseInfo.getProcessName());
- }
- blfkWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- blfkWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- blfkWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
- blfkWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- blfkWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
- blfkWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
- blfkWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
- blfkWebCaseFlowDTO.setHandleNotes("化解结果："+caseInfoUnfold.getMediResultName());
- blfkWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- // todo 审核不通过、通过的展示，有调解结果的
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
-
- }
+ // 审核节点要判断通过/不通过
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
+ // 处理不通过，任务类型就是回退
if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
-
+ webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
+ webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
+ webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ }else if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
+ // 处理通过
+ webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
+ webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
}
- blfkWebCaseFlowDTO.setStatus(caseTask.getStatus());
}
- handleCaseFlowList.add(blfkWebCaseFlowDTO);
+ // 结案申请，需要展示化解结果
+ if (FlowNodeEnum.FLOW_NODE_JASQ.getIndex().equals(caseTask.getNodeId())){
+ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseTask.getCaseId());
+ if (ObjectUtils.isNotEmpty(caseInfoUnfold)){
+ webCaseFlowDTO.setMediResult(caseInfoUnfold.getMediResult());
+ webCaseFlowDTO.setMediResultName(caseInfoUnfold.getMediResultName());
+ }
+ }
+ handleCaseFlowList.add(webCaseFlowDTO);
+ }else {
+ // 进行中的节点
+ WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
+ webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
+ webCaseFlowDTO.setStatus(caseTask.getStatus());
+ handleCaseFlowList.add(webCaseFlowDTO);
}
}
result.put("handleCaseFlowList", handleCaseFlowList);
@@ -1814,7 +1803,7 @@
htshCaseTask.setFlowableId(htshFlowNode.getFlowableId());
htshCaseTask.setProcessInstanceId(htshFlowNode.getProcessInstanceId());
htshCaseTask.setProcessTaskId(htshFlowNode.getProcessTaskId());
- htshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ htshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
htshCaseTask.setNodeType(htshFlowNode.getNodeType());
htshCaseTask.setNodeId(htshFlowNode.getNodeId());
htshCaseTask.setNodeName(htshFlowNode.getNodeName());
@@ -2035,7 +2024,7 @@
sbshCaseTask.setFlowableId(sbshFlowNode.getFlowableId());
sbshCaseTask.setProcessInstanceId(sbshFlowNode.getProcessInstanceId());
sbshCaseTask.setProcessTaskId(sbshFlowNode.getProcessTaskId());
- sbshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_3);
+ sbshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
sbshCaseTask.setNodeType(sbshFlowNode.getNodeType());
sbshCaseTask.setNodeId(sbshFlowNode.getNodeId());
sbshCaseTask.setNodeName(sbshFlowNode.getNodeName());
diff --git a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
index 3fa83a0..49e31dd 100644
--- a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
+++ b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_LHCZ_3LEVEL_V1.bpmn20.xml
@@ -2,12 +2,12 @@
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
<process id="GZDYH_LHCZ_3LEVEL_V1" name="GZDYH_LHCZ_3LEVEL_V1" isExecutable="true">
<documentation>GZDYH_LHCZ_3LEVEL_V1</documentation>
- <startEvent id="ZXSL_START" name="开始"/>
+ <startEvent id="START" name="开始"/>
<userTask id="BLFK" name="办理反馈"/>
- <endEvent id="ZXSL_END" name="结束"/>
+ <endEvent id="END" name="结束"/>
<userTask id="DSL" name="待受理"/>
- <sequenceFlow id="sid-6FA28350-5EFB-4393-B91A-D73ED7C3B390" sourceRef="ZXSL_START" targetRef="DSL"/>
- <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="ZXSL_END">
+ <sequenceFlow id="sid-6FA28350-5EFB-4393-B91A-D73ED7C3B390" sourceRef="START" targetRef="DSL"/>
+ <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="END">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-295E1BEE-52BD-4CA8-A7E9-654AA5DB7A4D" name="通过" sourceRef="DSL" targetRef="BLFK">
@@ -16,13 +16,13 @@
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_LHCZ_3LEVEL_V1">
<bpmndi:BPMNPlane bpmnElement="GZDYH_LHCZ_3LEVEL_V1" id="BPMNPlane_GZDYH_LHCZ_3LEVEL_V1">
- <bpmndi:BPMNShape bpmnElement="ZXSL_START" id="BPMNShape_ZXSL_START">
+ <bpmndi:BPMNShape bpmnElement="START" id="BPMNShape_START">
<omgdc:Bounds height="30.0" width="30.0" x="15.0" y="160.00001244246837"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="BLFK" id="BPMNShape_BLFK">
<omgdc:Bounds height="80.0" width="100.0" x="314.9999953061343" y="134.99999798834327"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="ZXSL_END" id="BPMNShape_ZXSL_END">
+ <bpmndi:BPMNShape bpmnElement="END" id="BPMNShape_END">
<omgdc:Bounds height="28.0" width="28.0" x="509.9999834597113" y="161.00001205503818"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="DSL" id="BPMNShape_DSL">
diff --git a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
index 146bcea..1ab88eb 100644
--- a/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
+++ b/dyh-service/dyh-mediate/src/main/resources/processes/GZDYH_ZXSL_3LEVEL_V1.bpmn20.xml
@@ -2,34 +2,34 @@
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
<process id="GZDYH_ZXSL_3LEVEL_V1" name="GZDYH_ZXSL_3LEVEL_V1" isExecutable="true">
<documentation>GZDYH_ZXSL_3LEVEL_V1</documentation>
- <startEvent id="ZXSL_START" name="开始"/>
+ <startEvent id="START" name="开始"/>
<userTask id="BLFK" name="办理反馈"/>
<userTask id="DSRPJ" name="当事人评价"/>
<userTask id="JAGD" name="结案归档"/>
<userTask id="JASH" name="结案审核"/>
- <endEvent id="ZXSL_END" name="结束"/>
+ <endEvent id="END" name="结束"/>
<userTask id="JASQ" name="结案申请"/>
- <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK">
- <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="JASQ">
- <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-0AE3E811-3EBD-4891-B2BD-F2E091E41541" name="通过" sourceRef="JASQ" targetRef="JASH">
+ <sequenceFlow id="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" sourceRef="JAGD" targetRef="END"/>
+ <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="START" targetRef="BLFK"/>
+ <sequenceFlow id="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" name="通过" sourceRef="DSRPJ" targetRef="JAGD">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-78554576-20C8-4A98-9A33-92DD5542AA27" name="结案审核同意" sourceRef="JASH" targetRef="DSRPJ">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_ty'}]]></conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" name="通过" sourceRef="DSRPJ" targetRef="JAGD">
+ <sequenceFlow id="sid-0AE3E811-3EBD-4891-B2BD-F2E091E41541" name="通过" sourceRef="JASQ" targetRef="JASH">
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" sourceRef="JAGD" targetRef="ZXSL_END"/>
- <sequenceFlow id="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" sourceRef="ZXSL_START" targetRef="BLFK"/>
+ <sequenceFlow id="sid-A0580378-38E0-44D8-981B-9D048ED42E97" name="通过" sourceRef="BLFK" targetRef="JASQ">
+ <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='forward'}]]></conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" name="结案审核不同意不同意" sourceRef="JASH" targetRef="BLFK">
+ <conditionExpression xsi:type="tFormalExpression"><![CDATA[${operation=='jash_bty'}]]></conditionExpression>
+ </sequenceFlow>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_GZDYH_ZXSL_3LEVEL_V1">
<bpmndi:BPMNPlane bpmnElement="GZDYH_ZXSL_3LEVEL_V1" id="BPMNPlane_GZDYH_ZXSL_3LEVEL_V1">
- <bpmndi:BPMNShape bpmnElement="ZXSL_START" id="BPMNShape_ZXSL_START">
+ <bpmndi:BPMNShape bpmnElement="START" id="BPMNShape_START">
<omgdc:Bounds height="30.0" width="30.0" x="195.0" y="160.00001244246837"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="BLFK" id="BPMNShape_BLFK">
@@ -44,34 +44,34 @@
<bpmndi:BPMNShape bpmnElement="JASH" id="BPMNShape_JASH">
<omgdc:Bounds height="80.0" width="100.0" x="659.9999901652337" y="134.99999798834327"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="ZXSL_END" id="BPMNShape_ZXSL_END">
+ <bpmndi:BPMNShape bpmnElement="END" id="BPMNShape_END">
<omgdc:Bounds height="28.0" width="28.0" x="1109.9999834597113" y="161.00001205503818"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="JASQ" id="BPMNShape_JASQ">
<omgdc:Bounds height="80.0" width="100.0" x="479.99999284744274" y="134.99998591840347"/>
</bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" id="BPMNEdge_sid-E2A63ACD-76CD-4419-A771-C082334A3A11">
+ <omgdi:waypoint x="224.94999837483869" y="175.00001039707323"/>
+ <omgdi:waypoint x="314.9999950161384" y="174.99999811788496"/>
+ </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-03DCE158-DCD9-4C4F-803A-FA2795072196" id="BPMNEdge_sid-03DCE158-DCD9-4C4F-803A-FA2795072196">
<omgdi:waypoint x="684.9999901652337" y="134.99999798834327"/>
<omgdi:waypoint x="684.9999901652337" y="105.00000053644179"/>
<omgdi:waypoint x="389.9999953061343" y="105.00000053644179"/>
<omgdi:waypoint x="389.9999953061343" y="134.99999798834327"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="sid-E2A63ACD-76CD-4419-A771-C082334A3A11" id="BPMNEdge_sid-E2A63ACD-76CD-4419-A771-C082334A3A11">
- <omgdi:waypoint x="224.94999837483869" y="175.00001039707323"/>
- <omgdi:waypoint x="314.9999950161384" y="174.99999811788496"/>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-A0580378-38E0-44D8-981B-9D048ED42E97" id="BPMNEdge_sid-A0580378-38E0-44D8-981B-9D048ED42E97">
<omgdi:waypoint x="414.94999530600165" y="174.9999943307857"/>
<omgdi:waypoint x="479.9999928473666" y="174.99998957230346"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="sid-78554576-20C8-4A98-9A33-92DD5542AA27" id="BPMNEdge_sid-78554576-20C8-4A98-9A33-92DD5542AA27">
- <omgdi:waypoint x="759.9499901651751" y="174.99999798834327"/>
- <omgdi:waypoint x="794.9999881535146" y="174.99999798834327"/>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5" id="BPMNEdge_sid-FE66E67A-D6D4-4E68-BB7E-14A17E87B9E5">
<omgdi:waypoint x="1059.9499856948855" y="175.00000415177684"/>
<omgdi:waypoint x="1109.999983378599" y="175.0000103275493"/>
</bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="sid-78554576-20C8-4A98-9A33-92DD5542AA27" id="BPMNEdge_sid-78554576-20C8-4A98-9A33-92DD5542AA27">
+ <omgdi:waypoint x="759.9499901651751" y="174.99999798834327"/>
+ <omgdi:waypoint x="794.9999881535146" y="174.99999798834327"/>
+ </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="sid-15046AD2-218B-4567-B05A-26B2D0069DE2" id="BPMNEdge_sid-15046AD2-218B-4567-B05A-26B2D0069DE2">
<omgdi:waypoint x="894.9499881534662" y="174.99999798834327"/>
<omgdi:waypoint x="959.9999856948592" y="174.99999798834327"/>
--
Gitblit v1.8.0