From 54965653da29c37678098dd9c887a40df63ebdb5 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 23:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LingShanAgentServiceServiceImpl.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 35beffaaf3..cbe372d49a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -569,8 +569,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ List processNodes = rd.getProcessNodes(); // 创建起始节点 - LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, serviceRecord.getCreatedTime(), new ArrayList<>()); - processNodes.add(nc); + LingShanScreenServiceRstDTO.ProcessNode waitAcceptNode = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, serviceRecord.getCreatedTime(), new ArrayList<>()); // 根据最新状态拼接后续处理节点 int processStatus = serviceRecord.getProcessStatus().intValue(); @@ -578,28 +577,30 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ if (LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode() == processStatus) { // 已撤回 - LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, serviceRecord.getProcessTime(), new ArrayList<>()); - processNodes.add(nd); + LingShanScreenServiceRstDTO.ProcessNode withdrawNode = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, serviceRecord.getProcessTime(), new ArrayList<>()); + processNodes.add(withdrawNode); } else { // 正常处理流程 if (processStatus == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()) { // 受理 0 1 - LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); - processNodes.add(np); + LingShanScreenServiceRstDTO.ProcessNode acceptedNode = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); + processNodes.add(acceptedNode); } else if (processStatus == LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode()) { // 驳回 0 2 - LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); - processNodes.add(np); + LingShanScreenServiceRstDTO.ProcessNode rejectedNode = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); + processNodes.add(rejectedNode); } else { // 办结 0 1 3 - LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); - LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), serviceRecord.getCloseTime(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class)); - processNodes.add(na); - processNodes.add(ncc); + LingShanScreenServiceRstDTO.ProcessNode acceptedNode = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode closedNode = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), serviceRecord.getCloseTime(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class)); + processNodes.add(closedNode); + processNodes.add(acceptedNode); } } + processNodes.add(waitAcceptNode); + return rd; }