|
@ -2841,19 +2841,23 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
String currentPointName = planinfoMapper.getCurrentPointName(projectId); |
|
|
String currentPointName = planinfoMapper.getCurrentPointName(projectId); |
|
|
if (StringUtils.isNotBlank(currentPointName)) { |
|
|
if (StringUtils.isNotBlank(currentPointName)) { |
|
|
projectInfo.setCurrentPointName(currentPointName); |
|
|
projectInfo.setCurrentPointName(currentPointName); |
|
|
|
|
|
// 当且阶段有实际提交过文件
|
|
|
LambdaQueryWrapper<HuzhouPlaninfo> qw = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<HuzhouPlaninfo> qw = new LambdaQueryWrapper<>(); |
|
|
qw.eq(HuzhouPlaninfo::getTaskName, currentPointName) |
|
|
qw.eq(HuzhouPlaninfo::getTaskName, currentPointName) |
|
|
.eq(HuzhouPlaninfo::getProjectId, projectId); |
|
|
.eq(HuzhouPlaninfo::getProjectId, projectId); |
|
|
// HuzhouPlaninfo planInfo = planinfoMapper.selectOne(qw);
|
|
|
// HuzhouPlaninfo planInfo = planinfoMapper.selectOne(qw);
|
|
|
HuzhouPlaninfo planInfo =planinfoMapper.selectList(qw).get(0); |
|
|
HuzhouPlaninfo planInfo =planinfoMapper.selectList(qw).get(0); |
|
|
|
|
|
|
|
|
Date actualStartTime = planInfo.getActualStartTime(); |
|
|
Date actualStartTime = planInfo.getActualStartTime(); |
|
|
Date scheduledEndTime = planInfo.getScheduledEndTime(); |
|
|
Date scheduledEndTime = planInfo.getScheduledEndTime(); |
|
|
if (actualStartTime != null) { |
|
|
if (actualStartTime != null) { |
|
|
|
|
|
// 实际提交时间如果为null 的项目可能是在子项目中提交则本项目无实际提交时间
|
|
|
LocalDate realUpFileDate = actualStartTime.toInstant().atZone(java.time.ZoneId.of("Asia/Shanghai")).toLocalDate(); |
|
|
LocalDate realUpFileDate = actualStartTime.toInstant().atZone(java.time.ZoneId.of("Asia/Shanghai")).toLocalDate(); |
|
|
LocalDate scheduledEndDate = scheduledEndTime.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); |
|
|
long daysBetween = ChronoUnit.DAYS.between(scheduledEndDate, realUpFileDate); |
|
|
if (daysBetween > 0) { |
|
|
if (daysBetween > 0) { |
|
|
|
|
|
// 计算项目超时情况(天数)
|
|
|
projectInfo.setProjectTimeOutSituation(String.valueOf(daysBetween)); |
|
|
projectInfo.setProjectTimeOutSituation(String.valueOf(daysBetween)); |
|
|
log.info("项目:{}->当且节点:{}->超时完成天数为:{}", projectInfo.getProjectName(),currentPointName, daysBetween); |
|
|
log.info("项目:{}->当且节点:{}->超时完成天数为:{}", projectInfo.getProjectName(),currentPointName, daysBetween); |
|
|
log.info("计划结束时间为:{}->实际开始提交时间为:{}", scheduledEndDate,realUpFileDate); |
|
|
log.info("计划结束时间为:{}->实际开始提交时间为:{}", scheduledEndDate,realUpFileDate); |
|
@ -2865,7 +2869,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
projectInfo.setCurrentPointName("未执行"); |
|
|
projectInfo.setCurrentPointName("未执行"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 其他设置操作...
|
|
|
|
|
|
// 2.设置整体资金支付情况:上级资金支付比例=(实际支付上级资金/计划支付上级资金)*100%
|
|
|
// 2.设置整体资金支付情况:上级资金支付比例=(实际支付上级资金/计划支付上级资金)*100%
|
|
|
fillSuperiorFundPayRate(projectInfo); |
|
|
fillSuperiorFundPayRate(projectInfo); |
|
|
|
|
|
|
|
|