Merge branch 'lingshan_master' into dev

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;

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

@@ -560,6 +560,11 @@ 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();