From 361450dd8c96d218cf708eddc14362c32f4eb7d0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 28 Dec 2020 15:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E7=A8=8B=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/VotingIssueListResultDTO.java      |  2 +-
 .../resources/mapper/govissue/IssueDao.xml    |  4 +--
 .../mapper/govproject/ProjectDao.xml          | 26 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/VotingIssueListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/VotingIssueListResultDTO.java
index d65eb15870..e514dc21c8 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/VotingIssueListResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/VotingIssueListResultDTO.java
@@ -35,7 +35,7 @@ public class VotingIssueListResultDTO implements Serializable {
     /**
      * 议题创建时间
      * */
-    private Long issuePublishTime;
+    private Long createTime;
     /**
      * 实际总表决数
      * */
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 8d921cb909..7ecd695786 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -64,7 +64,7 @@
 
     <select id="selectIssueListByGridIds" resultType="com.epmet.dataaggre.dto.govissue.result.IssueShiftProjectResultDTO">
         SELECT
-            i.id AS "issueId",,
+            i.id AS "issueId",
             i.issue_title AS "issueTitle",
             ( SELECT count(id) FROM issue_vote_detail WHERE del_flag = '0' AND issue_id = i.id ) AS "count"
         FROM
@@ -74,7 +74,7 @@
         AND i.issue_status = 'shift_project'
         AND i.org_id_path like concat('%', #{agencyId}, '%')
         ORDER BY
-            count DESC
+            count DESC, i.created_time ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index 48b36cc8b3..681ce3c429 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -53,28 +53,28 @@
 
     <select id="selectShiftProjectList" resultType="com.epmet.dataaggre.dto.govproject.ProjectDTO">
         SELECT
-        p.*,
-        IFNULL(pp.public_reply, "") AS publicReply
+            p.*,
+            IFNULL(pp.public_reply, "") AS publicReply
         FROM
-        project p
+            project p
         LEFT JOIN
-        (SELECT
-        project_id,
-        public_reply
-        FROM
-        project_process
-        WHERE
-        del_flag = '0'
-        AND operation = 'close'
+        (   SELECT
+                project_id,
+                public_reply
+            FROM
+                project_process
+            WHERE
+                del_flag = '0'
+            AND operation = 'close'
         ) pp ON p.id = pp.project_id
         WHERE
-        p.del_flag = '0'
+            p.del_flag = '0'
         AND p.origin = 'issue'
         <foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
             p.origin_id = #{issueId}
         </foreach>
         ORDER BY
-        created_time ASC
+            p.created_time ASC
     </select>
 
     <select id="selectDepartmentNameList" resultType="java.lang.String">