From 3e35884669ba443734e49fb3b7e020097f49e880 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 14 Nov 2024 10:22:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dto/PreparationScheduleDTO.java | 7 +------ .../cool/store/service/impl/ExportRealizeServiceImpl.java | 2 +- .../com/cool/store/service/impl/ExportServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java index 0a0843815..54e038c23 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/PreparationScheduleDTO.java @@ -10,11 +10,6 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.time.temporal.ChronoUnit; import java.util.Date; -/** - * @Author suzhuhong - * @Date 2024/4/26 15:00 - * @Version 1.0 - */ @Data @ContentStyle(horizontalAlignment = HorizontalAlignment.LEFT,wrapped = true) public class PreparationScheduleDTO { @@ -37,7 +32,7 @@ public class PreparationScheduleDTO { @ExcelProperty("门店编号") @ColumnWidth(30) @ApiModelProperty("门店编码") - private String storeNum; + private String shopCode; @ExcelProperty("当前进度") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 3d24cf2e7..9a05d277e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -115,7 +115,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto1.setUsername(x.getUsername()); dto1.setShopName(x.getShopName()); dto1.setPlanOpenTime(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, x.getPlanOpenTime())); - dto1.setStoreNum(x.getStoreNum()); + dto1.setShopCode(x.getShopCode()); dto1.setSupervisionName(userInfoMap.getOrDefault(x.getSupervisorUserId(), new EnterpriseUserDO()).getName()); dto1.setInvestmentManagerName(userInfoMap.getOrDefault(x.getInvestmentManager(), new EnterpriseUserDO()).getName()); dto1.setRegionNodeName(regionNameMap.getOrDefault(x.getRegionId(), "")); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java index 2e4233e9c..80656b11e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java @@ -81,7 +81,7 @@ public class ExportServiceImpl implements ExportService { request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds())); } } - //开业进度数据 + //进度数据 List preparationDTOS = shopInfoDAO.ListByCondition(request); if (CollectionUtils.isEmpty(preparationDTOS)) { throw new ServiceException(ErrorCodeEnum.NO_DATA);