Merge remote-tracking branch 'origin/dev_pyscreen' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -95,6 +95,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2020/9/8 3:36 下午
      */
     String selectPid(@Param("agencyId") String agencyId);
+    String selectParentId(@Param("agencyId") String agencyId);
 
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -617,6 +617,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),orgInfos.stream().map(o -> o.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                subGridPartyAvgScore.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@@ -703,6 +707,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
 //                List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,form.getCustomerAreaCode(),NumConstant.SIX);
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),orgInfos.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                districtGovernAvgList.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
                 log.info(districtGovernAvgList.toString());
                 for (int i = 0; i < districtGovernAvgList.size(); i++) {
@@ -794,6 +802,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
 //                List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,form.getCustomerAreaCode(),NumConstant.SIX);
                 List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),orgInfos.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                subStreetAvgList.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("subStreetAvgList:::"+subStreetAvgList.toString());
                 for (int i = 0; i < subStreetAvgList.size(); i++) {
                     if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -404,4 +404,12 @@
         WHERE DEL_FLAG = 0
           and sca.PARENT_AREA_CODE = #{areaCode}
     </select>
+    <select id="selectParentId" resultType="java.lang.String">
+        select sca.AGENCY_ID from screen_customer_agency sca
+        where sca.AREA_CODE=
+              (
+                  select m.PARENT_AREA_CODE from screen_customer_agency m
+                  where m.AGENCY_ID=#{agencyId}
+              )
+    </select>
 </mapper>