From 2f15711e169218d6bc163e3b2132cf939007c6f2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 10:37:23 +0800
Subject: [PATCH 1/3] categoryCode

---
 .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index c9f0542de6..82942d0637 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/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,7 +18,7 @@ public class DemandRecResultDTO implements Serializable {
     private String gridName;
     private String agencyId;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String categoryCode;
     private String categoryName;
 

From 336502a81d368f7336c4404e184669a0e2d60a61 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 10:38:06 +0800
Subject: [PATCH 2/3] categoryCode

---
 .../java/com/epmet/dto/result/demand/DemandRecResultDTO.java     | 1 +
 .../src/main/resources/mapper/IcUserDemandRecDao.xml             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index 82942d0637..afb1939d34 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -20,6 +20,7 @@ public class DemandRecResultDTO implements Serializable {
 
     //@JsonIgnore
     private String categoryCode;
+    private String parentCode;
     private String categoryName;
 
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 6459d02269..33d471906e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/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,

From 02bb9ab12e2b87310641140f1407d7dea0c108c8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Nov 2021 10:40:35 +0800
Subject: [PATCH 3/3] tongyi

---
 .../epmet/dto/result/demand/DemandRecResultDTO.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index afb1939d34..d1eac19bff 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -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;
 
     /**