获取下级部门的数据 添加月份条件，并返回组织类型

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnNingSubAgencyIndexRankFormDTO.java → epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankYMFormDTO.java

@@ -8,20 +8,22 @@ import java.io.Serializable;
 
 /**
  * 5、下级部门指数排行（安宁数据段用） 入参
+ *
  * @Author zhangyong
  * @DateTime 2020/09/08 9:54
  */
 @Data
-public class AnNingSubAgencyIndexRankFormDTO implements Serializable {
+public class SubAgencyIndexRankYMFormDTO implements Serializable {
 
     private static final long serialVersionUID = -2920561669035794486L;
 
-    public interface SubAgencyIndexRank{}
+    public interface SubAgencyIndexRank {
+    }
 
     /**
      * 机关ID
      */
-    @NotBlank(message = "组织id不能为空",groups = {SubAgencyIndexRank.class})
+    @NotBlank(message = "组织id不能为空", groups = {SubAgencyIndexRank.class})
     private String agencyId;
 
     /**
@@ -33,12 +35,17 @@ public class AnNingSubAgencyIndexRankFormDTO implements Serializable {
     /**
      * asc 正序， desc 降序
      */
-    @NotNull(message = "排序方式不能为空",groups = {SubAgencyIndexRank.class})
+    @NotNull(message = "排序方式不能为空", groups = {SubAgencyIndexRank.class})
     private String sort;
 
     /**
      * 年度：year 月度：month
      */
-    @NotNull(message = "年度、月度不能为空",groups = {SubAgencyIndexRank.class})
+    @NotNull(message = "年度、月度不能为空", groups = {SubAgencyIndexRank.class})
     private String type;
+
+    /**
+     * 月份Id
+     */
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AnNingSubAgencyIndexRankResultDTO.java

@@ -42,4 +42,9 @@ public class AnNingSubAgencyIndexRankResultDTO implements Serializable {
      * 组织id或者网格id
      */
     private String orgId = "";
+
+    /**
+     * 组织类型
+     */
+    private String orgType = "";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -1,6 +1,7 @@
 package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
 import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -83,16 +84,18 @@ public class IndexController {
 
     /**
      * 5、下级部门指数排行（安宁数据段用）
+     *
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>>
      * @Author zhangyong
      * @Date 13:39 2020-09-11
      **/
+    @InternalAppRequestAuth
     @ExternalAppRequestAuth
     @PostMapping("dataclient/subagencyindexrank")
-    public Result<List<AnNingSubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO) {
+    public Result<List<AnNingSubAgencyIndexRankResultDTO>> getSubAgencyIndexRank(@RequestBody SubAgencyIndexRankYMFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
+        ValidatorUtils.validateEntity(formDTO, SubAgencyIndexRankYMFormDTO.SubAgencyIndexRank.class);
-        return new Result<List<AnNingSubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
+        return new Result<List<AnNingSubAgencyIndexRankResultDTO>>().ok(indexService.getSubAgencyIndexRank(formDTO));
     }
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -17,10 +17,10 @@
 
 package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.GridIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.PeerComparisonFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -68,7 +68,7 @@ public interface ScreenIndexDataMonthlyDao{
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectSubAgencyOrGridIndexMonthlyRank(SubAgencyIndexRankYMFormDTO formDTO);
 
     /**
      * desc：获取网格指标排行

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataYearlyDao.java

@@ -17,7 +17,7 @@
 
 package com.epmet.datareport.dao.evaluationindex.screen;
 
-import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -50,5 +50,5 @@ public interface ScreenIndexDataYearlyDao{
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(SubAgencyIndexRankYMFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java

@@ -46,14 +46,14 @@ public interface IndexService {
     List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 
     /**
-     * 5、下级部门指数排行（安宁数据段用）
+     * 5、按月或年 下级组织指数排行
      *
      * @param formDTO
      * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> getSubAgencyIndexRank(SubAgencyIndexRankYMFormDTO formDTO);
 
     /**
      * desc:获取该客户下网格排行

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

@@ -6,7 +6,6 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
-import com.epmet.datareport.utils.DateUtils;
 import com.epmet.evaluationindex.screen.constant.ScreenConstant;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
@@ -19,6 +18,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,7 +39,7 @@ public class IndexServiceImpl implements IndexService {
     @Autowired
     private PartyMemberLeadServiceImpl partyMemberLeadServiceImpl;
     @Autowired
-    private DateUtils dateUtils;
+    private com.epmet.datareport.utils.DateUtils dateUtils;
 
     /**
      * @Description  1、年度平均指数
@@ -204,16 +204,20 @@ public class IndexServiceImpl implements IndexService {
         return subAgencyIndexRankResultDTOS;
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
-    public List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
+    public List<AnNingSubAgencyIndexRankResultDTO> getSubAgencyIndexRank(SubAgencyIndexRankYMFormDTO formDTO) {
         List<AnNingSubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
-        if (ScreenConstant.YEAR_ID.equals(formDTO.getType())){
+        if (ScreenConstant.YEAR_ID.equals(formDTO.getType())) {
             // 年 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
-        } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())){
+        } else if (ScreenConstant.MONTH_ID.equals(formDTO.getType())) {
             // 月(上一个月) 指数排行
-            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO);
+            if (StringUtils.isBlank(formDTO.getMonthId())) {
+                String monthId = com.epmet.commons.tools.utils.DateUtils.format(com.epmet.commons.tools.utils.DateUtils.addDateMonths(new Date(), -1), "yyyyMMdd");
+                formDTO.setMonthId(monthId);
+            }
+            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectSubAgencyOrGridIndexMonthlyRank(formDTO);
             subAgencyIndexRankResultDTOS.forEach(rank -> {
                 rank.setPartyDevAbility(getRound(rank.getPartyDevAbility()));
                 rank.setGovernAbility(getRound(rank.getGovernAbility()));

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

@@ -61,21 +61,23 @@
             LIMIT #{topNum}
     </select>
 
-    <!-- 下级部门指数排行 安宁 - 月 -->
+    <!-- 下级部门指数排行（不包含部门） 安宁 - 月 -->
-    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO"
+    <select id="selectSubAgencyOrGridIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
         service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
         party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
         govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
-        ORG_ID orgId
+        ORG_ID orgId,
+        ORG_TYPE orgType
         FROM
         screen_index_data_monthly
         WHERE
         del_flag = '0'
         AND parent_id = #{agencyId}
-        AND month_id = left(replace(DATE_SUB( CURDATE(),INTERVAL 1 MONTH),'-',''),6)
+        AND month_id = #{monthId,jdbcType=VARCHAR}
+        AND ORG_TYPE != 'department'
         <if test="sort == 'asc'">
             ORDER BY index_total ASC
         </if>

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

@@ -19,14 +19,15 @@
     </select>
 
     <!-- 下级部门指数排行 安宁 - 年 -->
-    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO"
+    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
         govern_ablity AS governAbility,
         party_dev_ablity AS partyDevAbility,
         service_ablity AS serviceAbility,
-        ORG_ID orgId
+        ORG_ID orgId,
+        ORG_TYPE orgType
         FROM
         screen_index_data_yearly
         WHERE