5、下级部门指数排行（安宁数据段用）

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

@@ -0,0 +1,44 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 5、下级部门指数排行（安宁数据段用） 入参
+ * @Author zhangyong
+ * @DateTime 2020/09/08 9:54
+ */
+@Data
+public class AnNingSubAgencyIndexRankFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2920561669035794486L;
+
+    public interface SubAgencyIndexRank{}
+
+    /**
+     * 机关ID
+     */
+    @NotBlank(message = "组织id不能为空",groups = {SubAgencyIndexRank.class})
+    private String agencyId;
+
+    /**
+     * 默认查询前几名
+     */
+    @NotNull(message = "默认查询名次不能为空",groups = {SubAgencyIndexRank.class})
+    private Integer topNum;
+
+    /**
+     * asc 正序， desc 降序
+     */
+    @NotNull(message = "排序方式不能为空",groups = {SubAgencyIndexRank.class})
+    private String sort;
+
+    /**
+     * 年度：year 月度：month
+     */
+    @NotNull(message = "年度、月度不能为空",groups = {SubAgencyIndexRank.class})
+    private String type;
+}

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

@@ -3,10 +3,7 @@ package com.epmet.datareport.controller.screen;
 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.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -84,4 +81,19 @@ public class IndexController {
         return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.subAgencyIndexRank(subAgencyIndexRankFormDTO));
     }
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用）
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    //@ExternalAppRequestAuth
+    @PostMapping("dataclient/subagencyindexrank")
+    public Result<List<SubAgencyIndexRankResultDTO>> anNingSubAgencyIndexRank(@RequestBody AnNingSubAgencyIndexRankFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, AnNingSubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
+        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.anNingSubAgencyIndexRank(formDTO));
+    }
+
 }

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

@@ -17,6 +17,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.MonthBarchartResult;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
@@ -59,4 +60,14 @@ public interface ScreenIndexDataMonthlyDao{
      */
     List<SubAgencyIndexRankResultDTO> selectSubAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用） - 月
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexMonthlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+
 }

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

@@ -17,10 +17,14 @@
 
 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.YearAverageIndexResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 指数-指数数据(按年统计)
  *
@@ -38,4 +42,13 @@ public interface ScreenIndexDataYearlyDao{
      */
     YearAverageIndexResultDTO selectYearAverageIndex(@Param("agencyId")String agencyId);
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用） - 年
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> selectAnNingSubAgencyIndexYearlyRank(AnNingSubAgencyIndexRankFormDTO formDTO);
 }

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

@@ -1,9 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.evaluationindex.screen.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthBarchartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO;
@@ -51,4 +48,14 @@ public interface IndexService {
      */
     List<SubAgencyIndexRankResultDTO> subAgencyIndexRank(SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO);
 
+    /**
+     * 5、下级部门指数排行（安宁数据段用）
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankFormDTO>>
+     * @Author zhangyong
+     * @Date 09:38 2020-09-08
+     **/
+    List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO);
+
 }

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

@@ -7,10 +7,7 @@ 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.dto.form.MonthBarchartFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.*;
-import com.epmet.evaluationindex.screen.dto.form.MonthPieChartFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO;
-import com.epmet.evaluationindex.screen.dto.form.YearAverageIndexFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -182,4 +179,17 @@ public class IndexServiceImpl implements IndexService {
         }
         return subAgencyIndexRankResultDTOS;
     }
+
+    @Override
+    public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
+        List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();
+        if ("year".equals(formDTO.getType())){
+            // 年 指数排行
+            subAgencyIndexRankResultDTOS = screenIndexDataYearlyDao.selectAnNingSubAgencyIndexYearlyRank(formDTO);
+        } else if ("month".equals(formDTO.getType())){
+            // 月 指数排行
+            subAgencyIndexRankResultDTOS = screenIndexDataMonthlyDao.selectAnNingSubAgencyIndexMonthlyRank(formDTO);
+        }
+        return subAgencyIndexRankResultDTOS;
+    }
 }

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

@@ -60,4 +60,27 @@
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>
+
+    <!-- 下级部门指数排行 安宁 - 月 -->
+    <select id="selectAnNingSubAgencyIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+        org_name AS `NAME`,
+        index_total AS totalIndex,
+        govern_ablity AS governAbility,
+        party_dev_ablity AS partyDevAbility,
+        service_ablity AS serviceAbility
+        FROM
+        screen_index_data_monthly
+        WHERE
+        del_flag = '0'
+        AND parent_id = #{agencyId}
+        AND month_id = date_format(CURDATE(), '%Y%m')
+        <if test="sort == 'asc'">
+            ORDER BY index_total ASC
+        </if>
+        <if test="sort == 'desc'">
+            ORDER BY index_total DESC
+        </if>
+        LIMIT #{topNum}
+    </select>
 </mapper>

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

@@ -18,4 +18,27 @@
             AND org_id = #{agencyId}
             AND year_id = DATE_FORMAT(NOW(),'%Y')
     </select>
+
+    <!-- 下级部门指数排行 安宁 - 年 -->
+    <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.AnNingSubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+        org_name AS `NAME`,
+        index_total AS totalIndex,
+        govern_ablity AS governAbility,
+        party_dev_ablity AS partyDevAbility,
+        service_ablity AS serviceAbility
+        FROM
+        screen_index_data_yearly
+        WHERE
+        del_flag = '0'
+        AND parent_id = #{agencyId}
+        AND year_id = YEAR(CURDATE())
+        <if test="sort == 'asc'">
+            ORDER BY index_total ASC
+        </if>
+        <if test="sort == 'desc'">
+            ORDER BY index_total DESC
+        </if>
+        LIMIT #{topNum}
+    </select>
 </mapper>