下级部门指数排行修改

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/SubAgencyIndexRankFormDTO.java

@@ -29,5 +29,5 @@ public class SubAgencyIndexRankFormDTO implements Serializable {
     @NotNull(message = "默认查询名次不能为空",groups = {SubAgencyIndexRank.class})
     private Integer topNum;
 
-    private String monthId;
+    private String yearId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -120,8 +120,8 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO) {
         LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
-        String monthId = now.toString().substring(NumConstant.ZERO,NumConstant.FOUR).concat(now.toString().substring(NumConstant.FIVE,NumConstant.SEVEN));
-        subAgencyIndexRankFormDTO.setMonthId(monthId);
+        int yearId = now.getYear();
+        subAgencyIndexRankFormDTO.setYearId(String.valueOf(yearId));
         List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRank(subAgencyIndexRankFormDTO);
         if (subAgencyIndexRankResultDTOS.size() == NumConstant.ZERO){
             return new ArrayList<>();

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -45,11 +45,11 @@
             party_dev_ablity AS partyDevAbility,
             service_ablity AS serviceAbility
         FROM
-            screen_index_data_monthly
+            screen_index_data_yearly
         WHERE
             del_flag = '0'
             AND parent_id = #{agencyId}
-            AND month_id = #{monthId}
+            AND year_id = #{yearId}
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>