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));
+            dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
+            log.warn("dateId 赋值为"+dateId+" ; selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
         }
-        log.info("=============dateId:"+dateId);
-        dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
         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,43 +132,46 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         param.getDataList().forEach(item -> {
             String projectStatusCode = item.getProjectStatusCode();
 
-            //todo 动态获取超时时间
+            //2021.3.8  epmet中，调用方传level，这边不再计算
-            //如果结案 结案时间立项时间；
+            if(item.getProjectLevel() == null){
-            if ("closed_case".equals(projectStatusCode)) {
+                //todo 动态获取超时时间
-                try {
+                //如果结案 结案时间立项时间；
-                    Date createTime = sdf.parse(item.getProjectCreateTime());
+                if ("closed_case".equals(projectStatusCode)) {
-                    Date closeCaseTime = sdf.parse(item.getCloseCaseTime());
+                    try {
-
+                        Date createTime = sdf.parse(item.getProjectCreateTime());
-                    if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
+                        Date closeCaseTime = sdf.parse(item.getCloseCaseTime());
-                        //如果结案时间-立项时间小于等于4天 未超期 level3
+
-                        item.setProjectLevel(3);
+                        if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
-                    } else if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
+                            //如果结案时间-立项时间小于等于4天 未超期 level3
-                        //如果结案时间-立项时间大于4天小于5天 即将超期 level2
+                            item.setProjectLevel(3);
-                        item.setProjectLevel(2);
+                        } else if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
-                    } else {
+                            //如果结案时间-立项时间大于4天小于5天 即将超期 level2
-                        //大于5天 已超期 level1
+                            item.setProjectLevel(2);
-                        item.setProjectLevel(1);
+                        } else {
+                            //大于5天 已超期 level1
+                            item.setProjectLevel(1);
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
                     }
-                } catch (ParseException e) {
+                } else if ("pending".equals(projectStatusCode)) {
-                    e.printStackTrace();
+                    //如果处理中 当前时间-立项时间；
-                }
+                    try {
-            } else if ("pending".equals(projectStatusCode)) {
+                        Date createTime = sdf.parse(item.getProjectCreateTime());
-                //如果处理中 当前时间-立项时间；
+
-                try {
+                        if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
-                    Date createTime = sdf.parse(item.getProjectCreateTime());
+                            //如果当前时间-立项时间小于等于4天 未超期 level3
-
+                            item.setProjectLevel(3);
-                    if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
+                        } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
-                        //如果当前时间-立项时间小于等于4天 未超期 level3
+                            //如果当前时间-立项时间大于4天小于5天 即将超期 level2
-                        item.setProjectLevel(3);
+                            item.setProjectLevel(2);
-                    } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
+                        } else {
-                        //如果当前时间-立项时间大于4天小于5天 即将超期 level2
+                            //大于5天 已超期 level1
-                        item.setProjectLevel(2);
+                            item.setProjectLevel(1);
-                    } else {
+                        }
-                        //大于5天 已超期 level1
+                    } catch (ParseException e) {
-                        item.setProjectLevel(1);
+                        e.printStackTrace();
                     }
-                } catch (ParseException e) {
-                    e.printStackTrace();
                 }
             }
             //先删除该projectId对应的旧数据