Merge remote-tracking branch 'origin/dev_ic_v2' into develop

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.result.demand;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,8 +18,9 @@ public class DemandRecResultDTO implements Serializable {
     private String gridName;
     private String agencyId;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String categoryCode;
+    private String parentCode;
     private String categoryName;
 
 
@@ -32,14 +32,14 @@ public class DemandRecResultDTO implements Serializable {
     private String content;
     private String reportUserName;
     private String reportUserMobile;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reportTime;
     private String demandUserId;
     private String demandUser;
     private String demandUserName;
     private String demandUserMobile;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date wantServiceTime;
 
     /**
@@ -57,7 +57,7 @@ public class DemandRecResultDTO implements Serializable {
     /**
      * 取消时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date cancelTime;
 
     /**
@@ -100,13 +100,13 @@ public class DemandRecResultDTO implements Serializable {
     /**
      * 实际服务开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date serviceStartTime;
 
     /**
      * 实际服务结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date serviceEndTime;
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -41,6 +41,7 @@
             r.GRID_ID as gridId,
             r.agency_id as agencyId,
             r.CATEGORY_CODE as categoryCode,
+            r.PARENT_CODE as parentCode,
             r.CONTENT,
             r.REPORT_TYPE as reportType,
             r.REPORT_TIME as reportTime,