From cea021d203f9b842d932869248a5dc24a659fd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 26 Jun 2024 18:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=B9=E5=BB=BA=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/PreparationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 1abf29594..8932d0110 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -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)) {