From 950bb3fb142f35f78820bcc6f5cc7f54e0a079e7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 13 Dec 2021 16:34:30 +0800
Subject: [PATCH] =?UTF-8?q?/resi/hall/issue/detail=E5=A2=9E=E5=8A=A0shiftI?=
 =?UTF-8?q?ssueTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/IssueResultDTO.java   | 4 ++++
 .../gov-issue-server/src/main/resources/mapper/IssueDao.xml  | 3 ++-
 .../main/java/com/epmet/dto/result/IssueDetailResultDTO.java | 5 +++++
 .../src/main/java/com/epmet/dto/result/IssueResultDTO.java   | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index c2dbdb85eb..f63ea2d492 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -49,4 +51,6 @@ public class IssueResultDTO implements Serializable {
      */
     private String gridName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index 8bfe2b9bf9..3d1d2bde61 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -36,7 +36,8 @@
             issue_status AS issueStatus,
             suggestion AS issueSuggestion,
             grid_id AS gridId,
-            created_by AS userId
+            created_by AS userId,
+            CREATED_TIME as shiftIssueTime
         FROM
             issue
         WHERE
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
index 295522ae79..69ebc4476c 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
 import com.epmet.dto.TopicInfoDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -74,4 +76,7 @@ public class IssueDetailResultDTO implements Serializable {
      * 态度 - opposition（反对）support（赞成）
      */
     private String attitude;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 }
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index b278b9f585..e1360eb01b 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -44,5 +46,7 @@ public class IssueResultDTO implements Serializable {
      */
     private String topicId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date shiftIssueTime;
 
 }