From 8c7e7d90c6102c767aa7b30cdbcd3edde2971c8e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 12 Jul 2021 15:49:54 +0800 Subject: [PATCH] =?UTF-8?q?"dataclient/subagencyindexrank",=E5=AD=94?= =?UTF-8?q?=E6=9D=91=E9=95=87=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenIndexDataMonthlyDao.java | 2 + .../screen/ScreenIndexDataYearlyDao.java | 3 + .../screen/impl/IndexServiceImpl.java | 14 +++- .../screen/ScreenIndexDataMonthlyDao.xml | 69 +++++++++++++++++++ .../screen/ScreenIndexDataYearlyDao.xml | 67 ++++++++++++++++++ 5 files changed, 153 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java index 976c3c85b4..18a3795b05 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java @@ -127,4 +127,6 @@ public interface ScreenIndexDataMonthlyDao{ @Param("yearId") String yearId, @Param("areaCode") String areaCode, @Param("topNum") int topNum); + + List selectKczSubAgencyOrGridIndexMonthlyRank(SubAgencyIndexRankYMFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java index 6735487317..2fb33f60d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java @@ -51,4 +51,7 @@ public interface ScreenIndexDataYearlyDao{ * @Date 09:38 2020-09-08 **/ List selectAnNingSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO); + + + List selectKczSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 993c590f05..643b27b4fd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -260,13 +260,23 @@ public class IndexServiceImpl implements IndexService { List subAgencyIndexRankResultDTOS = new ArrayList<>(); if (ScreenConstant.YEAR_ID.equals(formDTO.getType())) { // 年 指数排行 - subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO); + if("1234085031077498881".equals(formDTO.getAgencyId())){ + // 孔村单独处理,查询下下级 + subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectKczSubAgencyIndexYearlyRank(formDTO); + }else{ + subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO); + } } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) { // 月(上一个月) 指数排行 if (StringUtils.isBlank(formDTO.getMonthId())) { formDTO.setMonthId(DateUtils.getBeforeNMonth(1)); } - subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO); + if("1234085031077498881".equals(formDTO.getAgencyId())){ + // 孔村单独处理,查询下下级 + subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectKczSubAgencyOrGridIndexMonthlyRank(formDTO); + }else{ + subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO); + } subAgencyIndexRankResultDTOS.forEach(rank -> { rank.setPartyDevAbility(getRound(rank.getPartyDevAbility())); rank.setGovernAbility(getRound(rank.getGovernAbility())); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index f00cc4c23e..6c9eda9be7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -385,4 +385,73 @@ ORDER BY (sy.govern_ablity+sy.party_dev_ablity+sy.service_ablity) DESC LIMIT #{topNum} + + diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml index ad0132dd85..65af0e5f12 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml @@ -65,4 +65,71 @@ ORDER BY index_total ${sort} LIMIT #{topNum} + +