Merge branch 'dev_project_branch' into dev

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

@@ -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">