Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java

@@ -32,7 +32,8 @@ public class LingShanScreenServiceRstDTO {
      */
     private String latitude;
 
-    private String processTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date processTime;
     private String processDesc;
     private List<String> attachments;
     private String processStatus;
@@ -54,6 +55,8 @@ public class LingShanScreenServiceRstDTO {
         private String processStatusName;
         private String processorName;
         private String processDesc;
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date processTime;
         private List<String> processAttachments = new ArrayList<>();
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -560,11 +560,16 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         rd.setSatisfication(serviceRecord.getSatisfication());
         rd.setAttachments(JSON.parseArray(serviceRecord.getAttachments(), String.class));
 
+        if (serviceRecord.getProcessStatus() == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()
+                || serviceRecord.getProcessStatus() == LingShanAgentServiceProcessStatusEnum.CLOSED.getStatusCode()) {
+            rd.setProcessTime(serviceRecord.getProcessTime());
+        }
+
         // 处理进展
         List<LingShanScreenServiceRstDTO.ProcessNode> processNodes = rd.getProcessNodes();
 
         // 创建起始节点
-        LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, new ArrayList<>());
+        LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, serviceRecord.getCreatedTime(), new ArrayList<>());
         processNodes.add(nc);
 
         // 根据最新状态拼接后续处理节点
@@ -573,22 +578,22 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
 
         if (LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode() == processStatus) {
             // 已撤回
-            LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, new ArrayList<>());
+            LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, serviceRecord.getProcessTime(), new ArrayList<>());
             processNodes.add(nd);
         } else {
             // 正常处理流程
             if (processStatus == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()) {
                 // 受理 0 1
-                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>());
                 processNodes.add(np);
             } else if (processStatus == LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode()) {
                 // 驳回 0 2
-                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>());
                 processNodes.add(np);
             } else {
                 // 办结 0 1 3
-                LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>());
+                LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>());
-                LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class));
+                LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), serviceRecord.getCloseTime(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class));
                 processNodes.add(na);
                 processNodes.add(ncc);
             }
@@ -598,11 +603,14 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         return rd;
     }
 
-    private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, List<String> processAttachments) {
+    private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, Date processTime, List<String> processAttachments) {
         return new LingShanScreenServiceRstDTO.ProcessNode(
                 processStatusEnum.getStatusCode(),
                 processStatusEnum.getStatusName(),
-                applicantName, processDesc, processAttachments);
+                applicantName,
+                processDesc,
+                processTime,
+                processAttachments);
     }
 
     @Override