自测程序调整

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;
     /**
      * 实际总表决数
      * */

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>
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -74,7 +74,7 @@
             p.origin_id = #{issueId}
         </foreach>
         ORDER BY
-        created_time ASC
+            p.created_time ASC
     </select>
 
     <select id="selectDepartmentNameList" resultType="java.lang.String">