From 5e18916bb16211fd1ca668a464bcfe635fde8d48 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Feb 2021 17:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87/=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=8C=87=E6=95=B0=E6=8E=92=E8=A1=8C=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/SubAgencyIndexRankFormDTO.java     |  5 +++++
 .../screen/ScreenIndexDataMonthlyDao.java       |  1 +
 .../screen/impl/IndexServiceImpl.java           |  7 ++++++-
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
index b1ffd9243d..18fdae844f 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankFormDTO.java
@@ -35,4 +35,9 @@ public class SubAgencyIndexRankFormDTO implements Serializable {
      * area_code升级,新增此参数，来源于当前token
      */
     private String customerId;
+
+    /**
+     * 行政区域编码
+     */
+    private String areaCode;
 }
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 f9965876db..a3a0fb5dcc 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
@@ -56,6 +56,7 @@ public interface ScreenIndexDataMonthlyDao{
      * @date 2020/8/20 10:04 上午
      */
     List<SubAgencyIndexRankResultDTO> selectSubAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
+    List<SubAgencyIndexRankResultDTO> selectSubAgencyIndexRankNew(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 
     /**
      * 5、下级部门指数排行（安宁数据段用） - 月(上一个月)
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 179c13a282..5c89d256f6 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
@@ -230,7 +230,12 @@ public class IndexServiceImpl implements IndexService {
         LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
         int yearId = now.getYear();
         subAgencyIndexRankFormDTO.setYearId(String.valueOf(yearId));
-        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRank(subAgencyIndexRankFormDTO);
+        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
+        if (StringUtils.isNotEmpty(subAgencyIndexRankFormDTO.getAreaCode())){
+            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRankNew(subAgencyIndexRankFormDTO);
+        }else {
+            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyIndexRank(subAgencyIndexRankFormDTO);
+        }
         if (CollectionUtils.isEmpty(subAgencyIndexRankResultDTOS)){
             return new ArrayList<>();
         }
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 dedfb2d276..dbbffe6165 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
@@ -265,4 +265,21 @@
         ${sort}
         LIMIT #{topNum}
     </select>
+    <select id="selectSubAgencyIndexRankNew" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+            y.org_name AS NAME,
+            y.govern_ablity AS governAbility,
+            y.party_dev_ablity AS partyDevAbility,
+            y.service_ablity AS serviceAbility
+        FROM
+            screen_index_data_yearly y
+            LEFT JOIN screen_customer_agency ca ON ca.AGENCY_ID = y.ORG_ID
+        WHERE
+            y.del_flag = '0'
+          AND ca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+          AND y.year_id = #{yearId}
+          AND y.ORG_TYPE != 'department'
+        ORDER BY y.index_total DESC
+        LIMIT #{topNum}
+    </select>
 </mapper>