5、下级部门指数排行（目前安宁数据端用）, 返回值增加 orgId

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

@@ -0,0 +1,45 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zhangyong
+ * @DateTime 2020/09/11 9:58 上午
+ */
+@Data
+public class AnNingSubAgencyIndexRankResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2767000156092731932L;
+
+    /**
+     * 名称（组织或者网格名称，部门名称）
+     */
+    private String name = "";
+
+    /**
+     * 总指数
+     */
+    private Double totalIndex = 0.0;
+
+    /**
+     * 党建能力
+     */
+    private Double governAbility = 0.0;
+
+    /**
+     * 治理能力
+     */
+    private Double partyDevAbility = 0.0;
+
+    /**
+     * 服务能力
+     */
+    private Double serviceAbility = 0.0;
+
+    /**
+     * 组织id或者网格id
+     */
+    private String orgId = "";
+}

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

@@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
-import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -84,17 +81,16 @@ public class IndexController {
 
     /**
      *  5、下级部门指数排行（安宁数据段用）
-     *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>>
      * @Author zhangyong
-     * @Date 09:38 2020-09-08
+     * @Date 13:39 2020-09-11
      **/
     @ExternalAppRequestAuth
     @PostMapping("dataclient/subagencyindexrank")
-    public Result<List<SubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
+    public Result<List<AnNingSubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
-        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
+        return new Result<List<AnNingSubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
     }
 
 }

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

@@ -19,6 +19,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -64,10 +65,10 @@ public interface ScreenIndexDataMonthlyDao{
      * 5、下级部门指数排行（安宁数据段用） - 月(上一个月)
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 
 }

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

@@ -18,7 +18,7 @@
 package com.epmet.datareport.dao.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,9 +46,9 @@ public interface ScreenIndexDataYearlyDao{
      * 5、下级部门指数排行（安宁数据段用） - 年
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 }

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

@@ -1,10 +1,7 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
 import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.*;
-import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
-import com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO;
 
 import java.util.List;
 
@@ -52,10 +49,10 @@ public interface IndexService {
      * 5、下级部门指数排行（安宁数据段用）
      *
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO>
      * @Author zhangyong
      * @Date 09:38 2020-09-08
      **/
-    List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+    List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 
 }

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

@@ -183,8 +183,8 @@ public class IndexServiceImpl implements IndexService {
 
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
+    public List<AnNingSubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
-        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
+        List<AnNingSubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
         if (ScreenConstant.YEAR_ID.equals(formDTO.getType())){
             // 年 指数排行
             subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);

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

@@ -62,13 +62,15 @@
     </select>
 
     <!-- 下级部门指数排行 安宁 - 月 -->
-    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO"
+            resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
         index_total AS totalIndex,
         govern_ablity AS governAbility,
         party_dev_ablity AS partyDevAbility,
-        service_ablity AS serviceAbility
+        service_ablity AS serviceAbility,
+        ORG_ID orgId
         FROM
         screen_index_data_monthly
         WHERE

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

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