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

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

@@ -134,17 +134,16 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) {
         List<String> customerIds=new ArrayList<>();
         Result<List<String>> result=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
-        // log.info("result:  "+JSON.toJSONString(result));
+        // log.info("根据customerId查询其所有下级子客户id result:  "+JSON.toJSONString(result));
         if (result.success() && CollectionUtils.isNotEmpty(result.getData())) {
             customerIds.addAll(result.getData());
         }
         customerIds.add(formDTO.getCustomerId());
         String dateId= baseDao.selectLatestDateId(customerIds);
         if(StringUtils.isBlank(dateId)){
-            log.warn("selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
-        }
-        log.info("=============dateId:"+dateId);
             dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
+            log.warn("dateId 赋值为"+dateId+" ; selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
+        }
         WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
         // log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
@@ -168,6 +167,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
 
         returnDto.getSubRankList().addAll(subAgencyRankList);
         returnDto.getSubRankList().addAll(subGridList);
+        // log.info("returnDto.getSubRankList()="+returnDto.getSubRankList());
         int participateUserTotal = 0;
         int participateTotal = 0;
         for (WorkRecordSubRank subAgency : returnDto.getSubRankList()) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -132,6 +132,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         param.getDataList().forEach(item -> {
             String projectStatusCode = item.getProjectStatusCode();
 
+            //2021.3.8  epmet中，调用方传level，这边不再计算
+            if(item.getProjectLevel() == null){
                 //todo 动态获取超时时间
                 //如果结案 结案时间立项时间；
                 if ("closed_case".equals(projectStatusCode)) {
@@ -171,6 +173,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                         e.printStackTrace();
                     }
                 }
+            }
             //先删除该projectId对应的旧数据
             QueryWrapper<ScreenProjectDataEntity> deleteWrapper = new QueryWrapper<>();
             deleteWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())