Merge branch 'dev_project_branch' into dev_temp

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -318,28 +318,28 @@
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govissue.url>
                 <datasource.druid.govissue.username>epmet_gov_issue_user</datasource.druid.govissue.username>
                 <datasource.druid.govissue.password>EpmEt-db-UsEr</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govproject.url>
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.resigroup.url>
                 <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
                 <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetuser.url>
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java

@@ -280,8 +280,7 @@ public class GovIssueServiceImpl implements GovIssueService {
             shiftProject.setStatus(project.getStatus());
             return shiftProject;
         })).collect(Collectors.toList());
-        List<ShiftProjectIssueListResultDTO> result = resultList.stream().sorted(Comparator.comparing(ShiftProjectIssueListResultDTO::getCount, Comparator.reverseOrder()).thenComparing(ShiftProjectIssueListResultDTO::getShiftedTime, Comparator.reverseOrder())).collect(Collectors.toList());
-        return result;
+        return resultList;
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml

@@ -75,7 +75,7 @@
         AND i.issue_status = 'shift_project'
         AND i.org_id_path like concat('%', #{agencyId}, '%')
         ORDER BY
-            count DESC, i.created_time ASC
+            count DESC, i.shifted_time DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 

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

@@ -40,19 +40,19 @@
     <!-- 查询项目信息 -->
     <select id="selectProjectInfoClosed" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
         SELECT
-            p.ID AS projectId,
-            p.ORIGIN_ID AS issueId,
-            p.`STATUS`,
-            pp.PUBLIC_REPLY AS closedReason,
-            UNIX_TIMESTAMP( p.UPDATED_TIME ) AS operationTime
+        p.ID AS projectId,
+        p.ORIGIN_ID AS issueId,
+        p.`STATUS`,
+        pp.PUBLIC_REPLY AS closedReason,
+        UNIX_TIMESTAMP( p.UPDATED_TIME ) AS operationTime
         FROM project p
         LEFT JOIN project_process pp ON pp.PROJECT_ID = p.ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
-          AND pp.DEL_FLAG = '0'
-          AND
-              <foreach collection="issueIds" item="issueId" separator=" OR ">
-                  p.ORIGIN_ID = #{issueId}
-              </foreach>
+        AND pp.DEL_FLAG = '0'
+        AND(
+        <foreach collection="issueIds" item="issueId" separator=" OR ">
+            p.ORIGIN_ID = #{issueId}
+        </foreach>)
     </select>
 
     <!-- 查询项目信息【处理中】 -->
@@ -79,10 +79,10 @@
           AND ps.DEL_FLAG = '0'
           AND p.`STATUS` = 'pending'
           AND ps.IS_HANDLE = 'unhandled'
-          AND
+          AND(
             <foreach collection="issueIds" item="issueId" separator=" OR ">
-                p.ORIGIN_ID = #{issueId}
-            </foreach>
+              p.ORIGIN_ID = #{issueId}
+            </foreach>)
     </select>
 
     <select id="selectShiftProjectList" resultType="com.epmet.dataaggre.dto.govproject.ProjectDTO">
@@ -108,7 +108,7 @@
             p.origin_id = #{issueId}
         </foreach>
         ORDER BY
-            p.created_time ASC
+            p.created_time DESC
     </select>
 
     <select id="selectDepartmentNameList" resultType="java.lang.String">