Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen

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;
 }

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、下级部门指数排行（安宁数据段用） - 月(上一个月)

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<>();
         }

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>