逻辑判断&代码规范

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

@@ -95,7 +95,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 						return entity;
 					})).collect(Collectors.toList());
 
-			if (CollectionUtils.isEmpty(finishOrgList)) {
+			if (!CollectionUtils.isEmpty(finishOrgList)) {
 				closeProjects.forEach(close -> finishOrgList.stream().filter(finish -> close.getId().equals(finish.getProjectId())).forEach(dto -> {
 					String[] orgIds = dto.getPIdPath().split(StrConstant.COLON);
 					if (orgIds.length > NumConstant.ONE) {
@@ -327,9 +327,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
         int trace = factOriginProjectOrgPeriodDailyDao.selectIfExisted(param.getCustomerId());
         Boolean isFirst = trace <= NumConstant.ZERO;
         if (StringUtils.isBlank(param.getDateId())) {
-            Date yesterday = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24);
-            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
-            param.setDateId(format.format(yesterday));
+            param.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
         }
         List<ProjectOrgPeriodResultDTO> extractData =
                 projectProcessService.getProjectPeriod(isFirst, param.getCustomerId(), param.getDateId());