Commit 6d37ea49 authored by zhoushiguang's avatar zhoushiguang

Merge remote-tracking branch 'origin/master'

parents 45661253 10ee8592
......@@ -291,7 +291,7 @@ public class DiagnoServiceImpl implements DiagnoService {
List<CrossSchemeStageOptLogPO> list = crossSchedulesPOList.stream().filter(x -> x.getPhaseNo().equals(String.valueOf(crossPhasePO.getSort()))).collect(Collectors.toList());
if (ObjectUtils.isEmpty(list)) {
phaseOptTime.setOptGreenTime(0);
phaseOptTime.setOptTime(0);
phaseOptTime.setOptTime(0-oriPhaseTime);
} else {
CrossSchemeStageOptLogPO optLogPO = list.get(0);
Integer optPhaseTime = optLogPO.getPhaseTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment