diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 15f8698..c2881b7 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -2841,19 +2841,23 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(HuzhouPlaninfo::getTaskName, currentPointName) .eq(HuzhouPlaninfo::getProjectId, projectId); // HuzhouPlaninfo planInfo = planinfoMapper.selectOne(qw); HuzhouPlaninfo planInfo =planinfoMapper.selectList(qw).get(0); + Date actualStartTime = planInfo.getActualStartTime(); Date scheduledEndTime = planInfo.getScheduledEndTime(); if (actualStartTime != null) { + // 实际提交时间如果为null 的项目可能是在子项目中提交则本项目无实际提交时间 LocalDate realUpFileDate = actualStartTime.toInstant().atZone(java.time.ZoneId.of("Asia/Shanghai")).toLocalDate(); LocalDate scheduledEndDate = scheduledEndTime.toInstant().atZone(java.time.ZoneId.of("Asia/Shanghai")).toLocalDate(); - // 计算相差天数 + long daysBetween = ChronoUnit.DAYS.between(scheduledEndDate, realUpFileDate); if (daysBetween > 0) { + // 计算项目超时情况(天数) projectInfo.setProjectTimeOutSituation(String.valueOf(daysBetween)); log.info("项目:{}->当且节点:{}->超时完成天数为:{}", projectInfo.getProjectName(),currentPointName, daysBetween); log.info("计划结束时间为:{}->实际开始提交时间为:{}", scheduledEndDate,realUpFileDate); @@ -2865,7 +2869,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl