平阴大屏新增api/data/report/screen/index/subagencyindexrank-py:下级部门or网格指数排行

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

@@ -0,0 +1,38 @@
+package com.epmet.evaluationindex.screen.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/2/28 14:29
+ */
+@Data
+public class SubAgencyIndexRankPyFormDTO implements Serializable {
+    private static final long serialVersionUID = 8930332375421099186L;
+    /**
+     * 当前组织，平阴大屏，默认传跟组织
+     * */
+    @NotBlank(message = "agencyId不能为空")
+    private String agencyId;
+
+    /**
+     * 目前只有平阴在传，默认赋值：370124
+     * */
+    @NotBlank(message = "areaCode不能为空;平阴默认传：370124")
+    private String areaCode;
+
+    /**
+     * 默认查询前10条
+     * */
+    @NotNull(message = "topNum不能为空")
+    private Integer topNum;
+
+    @NotBlank(message = "type不能为空,街道：street;网格：grid")
+    private String type;
+}

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

@@ -150,5 +150,15 @@ public class IndexController {
         return new Result<List<IndexAdvanceBranchRankResultDTO>>().ok(indexService.advancedBranchRank(formDTO));
     }
 
-
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @Date 2021/2/28 14:33
+     **/
+    @PostMapping("subagencyindexrank-py")
+    Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRankPy(@RequestBody SubAgencyIndexRankPyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.subAgencyIndexRankPy(formDTO));
+    }
 }

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

@@ -103,4 +103,20 @@ public interface ScreenIndexDataMonthlyDao{
      * @author sun
      */
     List<PeerComparisonResultDTO> getSingleIndexRank(SubSingleIndexRankFormDTO formDTO);
+
+    /**
+     * @param yearId
+     * @param areaCode
+     * @Description 根据areaCode查询下级指数
+     * @author yinzuomei
+     */
+    List<SubAgencyIndexRankResultDTO> selectSubStreetByAreaCode(@Param("yearId")String yearId, @Param("areaCode")String areaCode,@Param("topNum") int topNum);
+
+    /**
+     * @param yearId
+     * @param areaCode
+     * @Description 根据areaCode查询网格指数
+     * @author yinzuomei
+     */
+    List<SubAgencyIndexRankResultDTO> selectSubGridByAreaCode(@Param("yearId")String yearId, @Param("areaCode")String areaCode,@Param("topNum") int topNum);
 }

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

@@ -86,4 +86,12 @@ public interface IndexService {
      * @date 2020/10/22 10:58 上午
      */
     List<PeerComparisonResultDTO> getSubSingleIndexRank(SubSingleIndexRankFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @Date 2021/2/28 14:33
+     **/
+    List<SubAgencyIndexRankResultDTO> subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO);
 }

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

@@ -3,6 +3,7 @@ package com.epmet.datareport.service.evaluationindex.screen.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.CommonOperateTypeEnum;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao;
@@ -385,4 +386,40 @@ public class IndexServiceImpl implements IndexService {
         return list;
     }
 
+    /**
+     * @param formDTO
+     * @author yinzuomei
+     * @description 8、平阴大屏-下级街道or网格指数排行
+     * @Date 2021/2/28 14:33
+     **/
+    @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    public List<SubAgencyIndexRankResultDTO> subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO) {
+        if (!"street".equals(formDTO.getType()) && !"grid".equals(formDTO.getType())) {
+            throw new RenException("type传参错误,街道：street;网格：grid");
+        }
+        LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
+        String yearId = String.valueOf(now.getYear());
+        if("street".equals(formDTO.getType())){
+            List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+            // 小数四舍五入
+            streetList.forEach(indexRank -> {
+                indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
+                indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
+                indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
+                indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
+            });
+            return streetList;
+        }
+        List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+        // 小数四舍五入
+        gridList.forEach(indexRank -> {
+            indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
+            indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
+            indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
+            indexRank.setTotalIndex(getRound(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility()));
+        });
+        return gridList;
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -241,6 +241,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
      * @Date 2021/2/27 19:56
      **/
     @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     public VoluntaryServiceTrendResultDTO voluntaryServiceTrend(VoluntaryServiceTrendFormDTO formDTO) {
         VoluntaryServiceTrendResultDTO resultDTO = new VoluntaryServiceTrendResultDTO();
         //近12个月的monthId集合,["202002","202003","202004","202005","202006","202007","202008","202009","202010","202011","202012","202101"]

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

@@ -282,4 +282,44 @@
         ORDER BY y.index_total DESC
         LIMIT #{topNum}
     </select>
+
+    <select id="selectSubStreetByAreaCode" parameterType="map" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+            sca.AGENCY_NAME AS NAME,
+            sy.govern_ablity AS governAbility,
+            sy.party_dev_ablity AS partyDevAbility,
+            sy.service_ablity AS serviceAbility
+        FROM screen_customer_agency sca
+        left join screen_index_data_yearly sy
+        on(sca.AGENCY_ID=sy.ORG_ID
+            and sy.DEL_FLAG='0'
+            and sy.ORG_TYPE != 'department'
+            and sy.YEAR_ID=#{yearId}
+         )
+        WHERE
+                sca.del_flag = '0'
+                AND sca.PARENT_AREA_CODE=#{areaCode}
+        ORDER BY index_total DESC
+                LIMIT #{topNum}
+    </select>
+
+    <select id="selectSubGridByAreaCode" parameterType="map" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
+        SELECT
+            scg.GRID_NAME AS NAME,
+            sy.govern_ablity AS governAbility,
+            sy.party_dev_ablity AS partyDevAbility,
+            sy.service_ablity AS serviceAbility
+        FROM screen_customer_grid  scg
+        left join screen_index_data_yearly sy
+            on(scg.GRID_ID=sy.ORG_ID
+                and sy.DEL_FLAG='0'
+                and sy.ORG_TYPE != 'department'
+                and sy.YEAR_ID=#{yearId}
+            )
+        WHERE
+                scg.del_flag = '0'
+                AND scg.AREA_CODE like CONCAT(#{areaCode},'%')
+        ORDER BY index_total DESC
+                LIMIT #{topNum}
+    </select>
 </mapper>