Merge remote-tracking branch 'origin/dev'

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

@@ -97,4 +97,17 @@ public class GrassRootsGovernController {
         return new  Result<List<GovernCapacityRankResultDTO>>().ok(grassRootsGovernService.governCapacityRank(param));
     }
 
+    /**
+     * @Description 治理能力榜单查询 screen_govern_rank_data
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321627
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.20 17:46
+     **/
+    @PostMapping("governcapacityrank-origin")
+    public Result<List<GovernCapacityRankResultDTO>> governCapacityRankOrigin(@RequestBody AgencyAndNumFormDTO param){
+        ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new  Result<List<GovernCapacityRankResultDTO>>().ok(grassRootsGovernService.governCapacityRankOrigin(param));
+    }
 }

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

@@ -50,4 +50,7 @@ public interface ScreenGovernRankDataDao{
      * @date 2021/2/26 上午9:22
      */
     List<GovernCapacityResultDTO> selectGovernCapacityRatioNew(@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
+
+    List<GovernCapacityResultDTO> selectGovernCapacityRatioBak(@Param("monthId") String monthId,@Param("agencyId") String agencyId);
+    List<GovernCapacityResultDTO> selectGovernCapacityRatioNewBak(@Param("monthId") String monthId,@Param("orgIds") List<String> orgIds);
 }

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

@@ -65,6 +65,12 @@ public interface GrassRootsGovernService {
     **/
     List<GovernCapacityRankResultDTO> governCapacityRank(AgencyAndNumFormDTO param);
 
+    /**
+     * 治理能力榜单查询 screen_govern_rank_data
+     * @param param
+     * @return
+     */
+    List<GovernCapacityRankResultDTO> governCapacityRankOrigin(AgencyAndNumFormDTO param);
     /**
      * @Description 6、公众参与-柱状折线图
      * @NEI   https://nei.netease.com/interface/detail/req/?pid=57068&id=322434

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

@@ -293,6 +293,62 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         return result;
     }
 
+    /**
+     * 治理能力榜单查询 screen_govern_rank_data
+     * @param param
+     * @return
+     */
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @Override
+    public List<GovernCapacityRankResultDTO> governCapacityRankOrigin(AgencyAndNumFormDTO param) {
+        List<GovernCapacityResultDTO> orderList = new ArrayList<>();
+        if (null == param.getTopNum() || NumConstant.ZERO == param.getTopNum()) {
+            param.setTopNum(NumConstant.TEN);
+        }
+        String monthId = dateUtils.getCurrentMonthId();
+
+        if (StringUtils.isNotEmpty(param.getAreaCode())){
+            List<String> nextAgencyIds = screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(), param.getAgencyId());
+            if (CollectionUtils.isEmpty(nextAgencyIds)){
+                return new ArrayList<>();
+            }
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds);
+            int time = NumConstant.TWELVE;
+            while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){
+                time--;
+                monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+                PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatioNewBak(monthId,nextAgencyIds);
+            }
+        }else {
+            PageHelper.startPage(NumConstant.ONE,param.getTopNum());
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId());
+            int time = NumConstant.TWELVE;
+            while (CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE) {
+                time++;
+                monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+                PageHelper.startPage(NumConstant.ONE, param.getTopNum());
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatioBak(monthId, param.getAgencyId());
+            }
+        }
+        if(null == orderList || orderList.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<GovernCapacityRankResultDTO> result = new LinkedList<>();
+        orderList.forEach(o -> {
+            GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO();
+            rank.setAgencyName(o.getAgencyName());
+            rank.setGovernRatio(convertPercentStr(o.getGovernRatio(),NumConstant.ONE));
+            rank.setResolvedRatio(convertPercentStr(o.getResolvedRatio(),NumConstant.ONE));
+            rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
+            rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
+            rank.setParentAgencyName(o.getParentAgencyName());
+            rank.setMonthId(o.getMonthId());
+            result.add(rank);
+        });
+        return result;
+    }
     /**
      * @Description 6、公众参与-柱状折线图
      * @NEI   https://nei.netease.com/interface/detail/req/?pid=57068&id=322434

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

@@ -82,4 +82,82 @@
         RESPONSE_RATIO DESC
     </select>
 
+    <!-- 查询政府治理能力各项指标 -->
+    <select id="selectGovernCapacityRatioBak" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
+       SELECT
+            rankData.org_id as orgId,
+            rankData.ORG_NAME AS agencyName,
+            rankData.RESPONSE_RATIO,
+            rankData.RESOLVED_RATIO,
+            rankData.GOVERN_RATIO,
+            rankData.SATISFACTION_RATIO,
+            agency.AGENCY_NAME AS parentAgencyName
+        FROM
+            screen_govern_rank_data rankData
+        LEFT JOIN
+            screen_customer_agency agency
+            ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
+        WHERE
+            rankData.DEL_FLAG = '0'
+            AND rankData.PARENT_ID = #{agencyId}
+            AND rankData.MONTH_ID = #{monthId}
+        ORDER BY
+            rankData.RESPONSE_RATIO DESC
+    </select>
+
+    <!--  基层治理-治理能力榜单 多客户版，调用此sql -->
+    <select id="selectGovernCapacityRatioNewBak" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
+        (SELECT
+            agency.agency_id as orgId,
+            agency.AGENCY_NAME AS agencyName,
+            IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO,
+            IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
+            IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
+            IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
+            pa.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID as monthId
+        FROM screen_customer_agency agency
+        left join screen_customer_agency pa
+        on(agency.PARENT_AREA_CODE=pa.AREA_CODE
+            and pa.DEL_FLAG='0')
+        left join screen_govern_rank_data rankData
+            ON (agency.AGENCY_ID =rankData.org_id
+            AND rankData.DEL_FLAG = '0'
+            and rankData.org_type='agency')
+        WHERE
+            agency.DEL_FLAG = '0'
+            AND agency.agency_id in
+            <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
+                #{orgId}
+            </foreach>
+            AND rankData.MONTH_ID =#{monthId}
+        )
+        union
+        (
+        SELECT
+            grid.grid_id as orgId,
+            grid.GRID_NAME AS agencyName,
+            IFNULL(rankData.RESPONSE_RATIO,0) AS RESPONSE_RATIO,
+            IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
+            IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
+            IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
+            ca.agency_name AS parentAgencyName,
+            rankData.MONTH_ID as monthId
+        FROM screen_customer_grid grid
+        left join screen_customer_agency ca
+            on (ca.agency_id = grid.parent_agency_id)
+        left join screen_govern_rank_data_daily rankData
+            ON (grid.grid_id=rankData.org_id
+            AND grid.DEL_FLAG = 0
+            and rankData.org_type='grid')
+            WHERE grid.DEL_FLAG = '0'
+            AND grid.GRID_ID in
+            <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
+                #{orgId}
+            </foreach>
+            AND rankData.MONTH_ID =#{monthId}
+            )
+        ORDER BY
+        RESPONSE_RATIO DESC
+    </select>
 </mapper>