筹建详情

This commit is contained in:
苏竹红
2024-06-26 18:07:59 +08:00
parent 3ef3665909
commit cea021d203

View File

@@ -115,7 +115,7 @@ public class PreparationServiceImpl implements PreparationService {
ScheduleDTO dto = scheduleDTOMap.getOrDefault(x.getId(), new ScheduleDTO());
preparationScheduleVO.setCompletionColumn(dto.getCompletionColumn());
//-1 去掉视觉验收
preparationScheduleVO.setTotalColumn(dto.getTotalColumn()-1);
preparationScheduleVO.setTotalColumn(dto.getTotalColumn());
ShopStageInfoDO stageInfoDO = shopStageInfoDOMap.getOrDefault(x.getId(), new ShopStageInfoDO());
if (StringUtils.isNotEmpty(stageInfoDO.getActualCompleteTime())) {
preparationScheduleVO.setContractCompletionTime(DateUtils.strToDate(stageInfoDO.getActualCompleteTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
@@ -158,7 +158,7 @@ public class PreparationServiceImpl implements PreparationService {
if (CollectionUtils.isNotEmpty(shopContractActualCompletionTime)) {
ScheduleDTO scheduleDTO = shopContractActualCompletionTime.get(CommonConstants.ZERO);
preparationScheduleDetailVO.setCompletionColumn(scheduleDTO.getCompletionColumn());
preparationScheduleDetailVO.setTotalColumn(scheduleDTO.getTotalColumn()-1);
preparationScheduleDetailVO.setTotalColumn(scheduleDTO.getTotalColumn());
preparationScheduleDetailVO.setPlanCompletionTime(scheduleDTO.getPlanCompleteTime());
}
if (CollectionUtils.isNotEmpty(shop)) {