rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

逻辑判断&代码规范

dev
wangchao 5 years ago
parent
a616c8e53b
commit
bc050e4ef4
1 changed files with 2 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java

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

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

Write Preview
Loading…
Cancel
Save