From f34870dec4fa04b5c352d9e45f456a76456a6f5a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Oct 2022 16:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/VotingIssueListResultDTO.java    | 5 ++++-
 .../src/main/resources/mapper/IssueDao.xml                | 8 +++++---
 .../com/epmet/dto/result/VotingIssueListResultDTO.java    | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
index 6725684610..038d40a90d 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
@@ -19,7 +19,10 @@ public class VotingIssueListResultDTO implements Serializable {
      * 议题发布时间
      * */
     private Long issuePublishTime;
-
+    /**
+     * 议题发布时间
+     */
+    private String issuePublishTimeStr;
     /**
      * 议题Id
      * */
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 306a5c0204..77e9db60da 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
@@ -232,6 +232,7 @@
         <result column="issueTitle" property="issueTitle"/>
         <result column="suggestion" property="suggestion"/>
         <result column="issuePublishTime" property="issuePublishTime"/>
+        <result column="created_time" property="issuePublishTimeStr"/>
         <result column="sourceId" property="sourceId"/>
         <result column="sourceType" property="sourceType"/>
         <collection property="issueImgs" ofType="java.lang.String">
@@ -247,7 +248,8 @@
             UNIX_TIMESTAMP( i.created_time ) AS issuePublishTime,
             i.SOURCE_ID                    AS sourceId,
             i.SOURCE_TYPE as sourceType,
-            ia.url
+            ia.url,
+            DATE_FORMAT(i.created_time,'%Y-%m-%d %H:%i') as created_time
         FROM
             issue i
         left join  issue_attachment  ia
@@ -257,7 +259,7 @@
             AND i.GRID_ID = #{gridId}
             AND i.ISSUE_STATUS = 'voting'
         ORDER BY
-            i.created_time DESC,ia.SORT asc
+            i.created_time DESC
     </select>
 
     <resultMap id="ClosedIssueListResultDTOMap" type="com.epmet.dto.result.ClosedIssueListResultDTO">
@@ -291,7 +293,7 @@
             AND i.ISSUE_STATUS = 'closed'
             AND i.RESOLVE_TYPE = 'resolved'
         ORDER BY
-            i.created_time DESC,ia.sort asc
+            i.created_time DESC
     </select>
     <!-- 查询已关闭议题列表 政府端 -->
     <select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
index 9d58e5134f..d92fb105ef 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
@@ -21,6 +21,10 @@ public class VotingIssueListResultDTO implements Serializable {
      * 议题发布时间
      * */
     private Long issuePublishTime;
+    /**
+     * 议题发布时间
+     */
+    private String issuePublishTimeStr;
 
     /**
      * 议题Id