Merge remote-tracking branch 'origin/dev_project_branch' into dev_temp

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

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