From 8da905350fe149826544e7b266ebf97b54603bc3 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 3 Jul 2025 15:06:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A2=84=E7=82=B8=E5=93=81=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PreFryQualificationApplyMapper.xml | 5 +++- .../store/dto/pre/fry/ApplyManagementDTO.java | 9 ++++++++ .../PreFryQualificationApplyServiceImpl.java | 23 +++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml index 60ac2f08d..6b0826cd1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml @@ -66,11 +66,14 @@ c.username AS createUserName, c.mobile AS createUserMobile, a.created_time AS createTime, - a.audit_status AS auditStatus + a.audit_status AS auditStatus, + d.region_id as regionId, + d.investment_manager AS investmentManagerId FROM xfsg_pre_fry_qualification_apply a LEFT JOIN store_${enterpriseId} b ON a.store_code = b.store_num LEFT JOIN xfsg_line_info c ON c.partner_id = a.created_user_id + left join xfsg_shop_info d ON d.shop_code = a.store_code and a.apply_code LIKE CONCAT('%', #{applyCode}, '%') diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java index 9b3641469..ff4462155 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java @@ -1,5 +1,7 @@ package com.cool.store.dto.pre.fry; +import com.alibaba.excel.annotation.ExcelProperty; +import com.cool.store.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,6 +20,7 @@ public class ApplyManagementDTO { private String storeCode; @ApiModelProperty("门店名称") private String storeName; + @ExcelProperty(value = "申请单号",order = 1) @ApiModelProperty("申请单号") private String applyCode; @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ") @@ -32,5 +35,11 @@ public class ApplyManagementDTO { private Date createTime; @ApiModelProperty("审核状态：0-审批中，1-审核通过，2-审核不通过") private Integer auditStatus; + @ApiModelProperty("所属大区") + private String regionName; + private Long regionId; + private String investmentManagerId; + @ApiModelProperty("督导") + private String investmentManagerName; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java index 9bcde9eb6..20ed1962d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java @@ -2,8 +2,10 @@ package com.cool.store.service.impl; import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.PreFryApprovalRecordsDAO; import com.cool.store.dao.PreFryQualificationApplyDAO; +import com.cool.store.dao.RegionDao; import com.cool.store.dto.pre.fry.*; import com.cool.store.entity.PreFryApprovalRecordsDO; import com.cool.store.entity.PreFryQualificationApplyDO; @@ -17,16 +19,15 @@ import com.cool.store.utils.CoolDateUtils; import com.cool.store.vo.PartnerUserInfoVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Random; +import java.util.*; import java.util.concurrent.ThreadLocalRandom; +import java.util.stream.Collectors; /** * @Author suzhuhong @@ -40,6 +41,10 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA private PreFryQualificationApplyDAO preFryQualificationApplyDAO; @Resource private PreFryApprovalRecordsDAO preFryApprovalRecordsDAO; + @Resource + private EnterpriseUserDAO enterpriseUserDAO; + @Resource + private RegionDao regionDao; @Override @@ -125,6 +130,16 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA public PageInfo queryApplyManagementList(ApplyManagementQueryDTO query) { PageHelper.startPage(query.getPageNum(), query.getPageSize()); List applyManagementDTOS = preFryQualificationApplyDAO.selectApplyManagementList(query); + if (CollectionUtils.isNotEmpty(applyManagementDTOS)){ + Set userIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getInvestmentManagerId).collect(Collectors.toSet()); + Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); + Set regionIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getRegionId).collect(Collectors.toSet()); + Map regionNameMap = regionDao.getRegionNameMap(new ArrayList<>(regionIds)); + for (ApplyManagementDTO applyManagementDTO:applyManagementDTOS){ + applyManagementDTO.setInvestmentManagerName(userNameMap.getOrDefault(applyManagementDTO.getInvestmentManagerId(), "")); + applyManagementDTO.setRegionName(regionNameMap.getOrDefault(applyManagementDTO.getRegionId(), "")); + } + } return new PageInfo<>(applyManagementDTOS); } From 41b6179ecf6936d93294c73c70e44bc22cd66bbd Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 3 Jul 2025 15:56:51 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=A2=84=E7=82=B8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/FileTypeEnum.java | 1 + .../mapper/PreFryQualificationApplyMapper.xml | 9 +++++ .../store/dto/pre/fry/ApplyManagementDTO.java | 13 +++++++- .../dto/pre/fry/ApplyManagementQueryDTO.java | 5 +++ .../store/service/ExportRealizeService.java | 2 ++ .../com/cool/store/service/ExportService.java | 27 ++++++++++++--- .../impl/ExportRealizeServiceImpl.java | 33 +++++++++++++++++++ .../store/service/impl/ExportServiceImpl.java | 25 ++++++++++++++ .../PreFryQualificationApplyServiceImpl.java | 1 + .../controller/webb/ExportController.java | 7 ++++ 10 files changed, 118 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java index b45432fb4..99cf24b9b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java @@ -26,6 +26,7 @@ public enum FileTypeEnum { IMPORT_FITMENT_SHOP_STAGE("importFitmentShopStage", "导入装修阶段完成数据"), IMPORT_FITMENT_SHOP_STAGE_DATA_ERROR_LIST("OaOldShopStageDataErrorList", "导入装修阶段完成数据错误列表 "), SELLING_DETAILS_REPORT("sellingDetailsReport", "开店明细报表"), + PRE_FRY_QUALIFICATION_APPLY_EXPORT("preFryQualificationApplyExport", "预炸品资质申请导出"), ; private String fileType; private String desc; diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml index 6b0826cd1..a2fcb297a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml @@ -75,6 +75,15 @@ LEFT JOIN xfsg_line_info c ON c.partner_id = a.created_user_id left join xfsg_shop_info d ON d.shop_code = a.store_code + + and d.region_id in + + #{item} + + + + and d.investment_manager = #{investmentManagerId} + and a.apply_code LIKE CONCAT('%', #{applyCode}, '%') diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java index ff4462155..3118d225a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java @@ -1,7 +1,6 @@ package com.cool.store.dto.pre.fry; import com.alibaba.excel.annotation.ExcelProperty; -import com.cool.store.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +15,10 @@ import java.util.Date; public class ApplyManagementDTO { private Long id; + @ExcelProperty(value = "门店编号",order = 3) @ApiModelProperty("门店Code") private String storeCode; + @ExcelProperty(value = "门店名称",order = 2) @ApiModelProperty("门店名称") private String storeName; @ExcelProperty(value = "申请单号",order = 1) @@ -25,20 +26,30 @@ public class ApplyManagementDTO { private String applyCode; @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ") private Integer applyType; + @ExcelProperty(value = "申请类型",order =6) + private String applyTypeName; @ApiModelProperty("申请人ID") private String createUserId; + @ExcelProperty(value = "申请人",order = 7) @ApiModelProperty("申请人名称") private String createUserName; + @ExcelProperty(value = "申请人手机号",order =8) @ApiModelProperty("申请人手机号") private String createUserMobile; + @ExcelProperty(value = "申请时间",order = 9) + private String createTimeStr; @ApiModelProperty("申请时间") private Date createTime; + @ExcelProperty(value = "审核状态",order =10) + private String auditStatusName; @ApiModelProperty("审核状态：0-审批中，1-审核通过，2-审核不通过") private Integer auditStatus; + @ExcelProperty(value = "所属大区",order = 4) @ApiModelProperty("所属大区") private String regionName; private Long regionId; private String investmentManagerId; + @ExcelProperty(value = " 督导",order = 5) @ApiModelProperty("督导") private String investmentManagerName; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementQueryDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementQueryDTO.java index 650783bb0..58c41b392 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementQueryDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementQueryDTO.java @@ -4,6 +4,7 @@ import com.cool.store.common.PageBasicInfo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class ApplyManagementQueryDTO extends PageBasicInfo { @@ -25,4 +26,8 @@ public class ApplyManagementQueryDTO extends PageBasicInfo { private Date createTimeEnd; @ApiModelProperty("申请编号") private String applyCode; + @ApiModelProperty("所属大区") + private List regionIds; + @ApiModelProperty("所属督导") + private String investmentManagerId; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java index e16c5dfb6..28a816fb2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.dto.Preparation.PreparationDTO; +import com.cool.store.dto.pre.fry.ApplyManagementDTO; import com.cool.store.entity.ImportTaskDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.PointInfoDO; @@ -31,4 +32,5 @@ public interface ExportRealizeService { void exportZxjpOpenShopReport(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request); void exportZxjpOpenShopReportPage(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request); + void exportPreFryQualificationApply(List list, ImportTaskDO importTaskDO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java index feb260ab2..296baf6cc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java @@ -2,6 +2,7 @@ package com.cool.store.service; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dto.pre.fry.ApplyManagementQueryDTO; import com.cool.store.enums.FileTypeEnum; import com.cool.store.request.*; @@ -15,14 +16,32 @@ public interface ExportService { Long branchShopList(BranchShopRequest request,LoginUserInfo user); - //进度管理页面通用导出入口 - //财务导出 //加盟开店申请 //进度确认 + /** + * @Auther: wangshuo + * @Date: 2025/7/3 + * @description://进度管理页面通用导出入口 + * //财务导出 //加盟开店申请 //进度确认 + */ Long exportProgressBase(BranchShopRequest request, LoginUserInfo user, FileTypeEnum fileTypeEnum); - //正新鸡排加盟报表导出 + /** + * @Auther: wangshuo + * @Date: 2025/7/3 + * @description: //正新鸡排加盟报表导出 + */ Long exportZxjpOpenShopReport(FranchiseReportRequest request, LoginUserInfo user); - + /** + * @Auther: wangshuo + * @Date: 2025/7/3 + * @description: //正新鸡排门店维度加盟导出 + */ Long exportZxjpOpenShopReportPage(FranchiseReportRequest request, LoginUserInfo user); + /** + * @Auther: wangshuo + * @Date: 2025/7/3 + * @description:预炸资质申请管理 + */ + Long exportPreFryQualificationApply(ApplyManagementQueryDTO request, LoginUserInfo user); } 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 d3c50c60c..4cb2b63a2 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 @@ -9,6 +9,7 @@ import com.cool.store.dto.*; import com.cool.store.dto.Preparation.PreparationDTO; import com.cool.store.dto.Preparation.ScheduleDTO; +import com.cool.store.dto.pre.fry.ApplyManagementDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.enums.point.*; @@ -699,6 +700,38 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } } + @Override + public void exportPreFryQualificationApply(List list, ImportTaskDO importTaskDO) { + String url = ""; + try { + for (ApplyManagementDTO dto : list){ + dto.setApplyTypeName(PreFryApplyTypeEnum.getDescriptionByCode(dto.getApplyType())); + dto.setCreateTimeStr(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START,dto.getCreateTime())); + switch (dto.getAuditStatus()){ + case 0: + dto.setAuditStatusName("审批中"); + break; + case 1: + dto.setAuditStatusName("审核通过"); + break; + case 2: + dto.setAuditStatusName("审核不通过"); + break; + } + } + url = easyExcelUtil.exportExcel(ApplyManagementDTO.class, list, null, + FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START, new Date()), + FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START, new Date())); + } catch (Throwable e) { + log.error("fileUpload upload err, originFileName={}", FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc(), e); + throw new ServiceException(ErrorCodeEnum.INTERNAL_SERVER_ERROR); + } finally { + importTaskDO.setStatus(ImportStatusEnum.success.getCode()); + importTaskDO.setFileUrl(url); + importTaskMapper.update(eid, importTaskDO); + } + } + private String toString(Object o) { if (o == null) { return ""; 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 cab7e055f..2973bcf6a 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 @@ -6,9 +6,12 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.dao.LineInfoDAO; +import com.cool.store.dao.PreFryQualificationApplyDAO; import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dto.Preparation.PreparationDTO; import com.cool.store.dto.Preparation.ScheduleDTO; +import com.cool.store.dto.pre.fry.ApplyManagementDTO; +import com.cool.store.dto.pre.fry.ApplyManagementQueryDTO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.FileTypeEnum; @@ -75,6 +78,8 @@ public class ExportServiceImpl implements ExportService { private ShopService shopService; @Resource private FranchiseReportService franchiseReportService; + @Resource + private PreFryQualificationApplyDAO preFryQualificationApplyDAO; @@ -185,5 +190,25 @@ public class ExportServiceImpl implements ExportService { return (long) list.size(); } + @Override + public Long exportPreFryQualificationApply(ApplyManagementQueryDTO request, LoginUserInfo user) { + List list = preFryQualificationApplyDAO.selectApplyManagementList(request); + if (CollectionUtils.isEmpty(list)){ + log.error("导出数据为空"); + return 0L; + } + ImportTaskDO importTaskDO = new ImportTaskDO(); + importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode()); + importTaskDO.setFileName(FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, new Date())); + importTaskDO.setIsImport(Boolean.FALSE); + importTaskDO.setFileType(FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getFileType()); + importTaskDO.setCreateUserId(user.getUserId()); + importTaskDO.setCreateTime(new Date().getTime()); + importTaskDO.setCreateName(user.getName()); + importTaskMapper.insert(eid, importTaskDO); + exportRealizeService.exportPreFryQualificationApply(list, importTaskDO); + return 0L; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java index 20ed1962d..1b71ead34 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java @@ -12,6 +12,7 @@ import com.cool.store.entity.PreFryQualificationApplyDO; import com.cool.store.enums.AuditOperationTypeEnum; import com.cool.store.enums.AuditStatusEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.PreFryApplyTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.service.PreFryQualificationApplyService; import com.cool.store.userholder.CurrentUser; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java index 4b6412bf3..02bdb38b5 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.dto.pre.fry.ApplyManagementQueryDTO; import com.cool.store.enums.FileTypeEnum; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; @@ -68,4 +69,10 @@ public class ExportController { public ResponseResult zxjpOpenShopReportPage(@RequestBody FranchiseReportRequest request) { return ResponseResult.success(exportService.exportZxjpOpenShopReportPage(request, CurrentUserHolder.getUser())); } + + @PostMapping("/preFryQualificationApply") + @ApiOperation("预炸品资质申请导出") + public ResponseResult preFryQualificationApply(@RequestBody ApplyManagementQueryDTO request) { + return ResponseResult.success(exportService.exportPreFryQualificationApply(request, CurrentUserHolder.getUser())); + } } From d5ae81ffe8a42fd344810eeb9a04e3715439ccc9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 7 Jul 2025 10:02:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix=20=E9=98=B6=E6=AE=B5=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/PreFryQualificationApplyMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml index a2fcb297a..5aa035683 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml @@ -67,7 +67,7 @@ c.mobile AS createUserMobile, a.created_time AS createTime, a.audit_status AS auditStatus, - d.region_id as regionId, + b.region_id as regionId, d.investment_manager AS investmentManagerId FROM xfsg_pre_fry_qualification_apply a @@ -76,7 +76,7 @@ left join xfsg_shop_info d ON d.shop_code = a.store_code - and d.region_id in + and b.region_id in #{item} From 818856ecfa8f7afa0cc19029c80aa92a15f100ad Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 7 Jul 2025 10:22:10 +0800 Subject: [PATCH 04/11] fix --- .../com/cool/store/service/impl/ExportRealizeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4cb2b63a2..c9387f28d 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 @@ -720,8 +720,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } } url = easyExcelUtil.exportExcel(ApplyManagementDTO.class, list, null, - FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START, new Date()), - FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START, new Date())); + FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), + FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date())); } catch (Throwable e) { log.error("fileUpload upload err, originFileName={}", FileTypeEnum.PRE_FRY_QUALIFICATION_APPLY_EXPORT.getDesc(), e); throw new ServiceException(ErrorCodeEnum.INTERNAL_SERVER_ERROR); From 257198e9397b8beb893f11dc7d387cceeacfa63b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 7 Jul 2025 10:42:31 +0800 Subject: [PATCH 05/11] fix --- .../java/com/cool/store/service/impl/ExportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2973bcf6a..fa1c89cc3 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 @@ -207,7 +207,7 @@ public class ExportServiceImpl implements ExportService { importTaskDO.setCreateName(user.getName()); importTaskMapper.insert(eid, importTaskDO); exportRealizeService.exportPreFryQualificationApply(list, importTaskDO); - return 0L; + return (long) list.size(); } From 6a3f890f44739bf2f063ff10c9672dc564e86e7f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 09:31:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PreFryQualificationApplyMapper.xml | 14 +------------ .../store/dto/pre/fry/ApplyManagementDTO.java | 12 +++++------ .../PreFryQualificationApplyServiceImpl.java | 20 +++++++++---------- 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml index 5aa035683..60ac2f08d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryQualificationApplyMapper.xml @@ -66,24 +66,12 @@ c.username AS createUserName, c.mobile AS createUserMobile, a.created_time AS createTime, - a.audit_status AS auditStatus, - b.region_id as regionId, - d.investment_manager AS investmentManagerId + a.audit_status AS auditStatus FROM xfsg_pre_fry_qualification_apply a LEFT JOIN store_${enterpriseId} b ON a.store_code = b.store_num LEFT JOIN xfsg_line_info c ON c.partner_id = a.created_user_id - left join xfsg_shop_info d ON d.shop_code = a.store_code - - and b.region_id in - - #{item} - - - - and d.investment_manager = #{investmentManagerId} - and a.apply_code LIKE CONCAT('%', #{applyCode}, '%') diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java index 3118d225a..79997efbf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java @@ -26,30 +26,28 @@ public class ApplyManagementDTO { private String applyCode; @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ") private Integer applyType; - @ExcelProperty(value = "申请类型",order =6) + @ExcelProperty(value = "申请类型",order =4) private String applyTypeName; @ApiModelProperty("申请人ID") private String createUserId; - @ExcelProperty(value = "申请人",order = 7) + @ExcelProperty(value = "申请人",order = 5) @ApiModelProperty("申请人名称") private String createUserName; - @ExcelProperty(value = "申请人手机号",order =8) + @ExcelProperty(value = "申请人手机号",order =6) @ApiModelProperty("申请人手机号") private String createUserMobile; - @ExcelProperty(value = "申请时间",order = 9) + @ExcelProperty(value = "申请时间",order = 7) private String createTimeStr; @ApiModelProperty("申请时间") private Date createTime; - @ExcelProperty(value = "审核状态",order =10) + @ExcelProperty(value = "审核状态",order =8) private String auditStatusName; @ApiModelProperty("审核状态：0-审批中，1-审核通过，2-审核不通过") private Integer auditStatus; - @ExcelProperty(value = "所属大区",order = 4) @ApiModelProperty("所属大区") private String regionName; private Long regionId; private String investmentManagerId; - @ExcelProperty(value = " 督导",order = 5) @ApiModelProperty("督导") private String investmentManagerName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java index 1b71ead34..32de4db52 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java @@ -131,16 +131,16 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA public PageInfo queryApplyManagementList(ApplyManagementQueryDTO query) { PageHelper.startPage(query.getPageNum(), query.getPageSize()); List applyManagementDTOS = preFryQualificationApplyDAO.selectApplyManagementList(query); - if (CollectionUtils.isNotEmpty(applyManagementDTOS)){ - Set userIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getInvestmentManagerId).collect(Collectors.toSet()); - Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); - Set regionIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getRegionId).collect(Collectors.toSet()); - Map regionNameMap = regionDao.getRegionNameMap(new ArrayList<>(regionIds)); - for (ApplyManagementDTO applyManagementDTO:applyManagementDTOS){ - applyManagementDTO.setInvestmentManagerName(userNameMap.getOrDefault(applyManagementDTO.getInvestmentManagerId(), "")); - applyManagementDTO.setRegionName(regionNameMap.getOrDefault(applyManagementDTO.getRegionId(), "")); - } - } +// if (CollectionUtils.isNotEmpty(applyManagementDTOS)){ +// Set userIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getInvestmentManagerId).collect(Collectors.toSet()); +// Map userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds)); +// Set regionIds = applyManagementDTOS.stream().map(ApplyManagementDTO::getRegionId).collect(Collectors.toSet()); +// Map regionNameMap = regionDao.getRegionNameMap(new ArrayList<>(regionIds)); +// for (ApplyManagementDTO applyManagementDTO:applyManagementDTOS){ +// applyManagementDTO.setInvestmentManagerName(userNameMap.getOrDefault(applyManagementDTO.getInvestmentManagerId(), "")); +// applyManagementDTO.setRegionName(regionNameMap.getOrDefault(applyManagementDTO.getRegionId(), "")); +// } +// } return new PageInfo<>(applyManagementDTOS); } From 32ac5d82a9c4c60c61992634a09c5e32df23d778 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 09:52:12 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0@ExcelIgnore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dto/pre/fry/ApplyManagementDTO.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java index 79997efbf..f7cee8346 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java @@ -1,5 +1,6 @@ package com.cool.store.dto.pre.fry; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,41 +14,62 @@ import java.util.Date; */ @Data public class ApplyManagementDTO { - + @ExcelIgnore private Long id; + @ExcelProperty(value = "门店编号",order = 3) @ApiModelProperty("门店Code") private String storeCode; + @ExcelProperty(value = "门店名称",order = 2) @ApiModelProperty("门店名称") private String storeName; + @ExcelProperty(value = "申请单号",order = 1) @ApiModelProperty("申请单号") private String applyCode; + + @ExcelIgnore @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ") private Integer applyType; + @ExcelProperty(value = "申请类型",order =4) private String applyTypeName; + + @ExcelIgnore @ApiModelProperty("申请人ID") private String createUserId; + @ExcelProperty(value = "申请人",order = 5) @ApiModelProperty("申请人名称") private String createUserName; + @ExcelProperty(value = "申请人手机号",order =6) @ApiModelProperty("申请人手机号") private String createUserMobile; + @ExcelProperty(value = "申请时间",order = 7) private String createTimeStr; + + @ExcelIgnore @ApiModelProperty("申请时间") private Date createTime; + @ExcelProperty(value = "审核状态",order =8) private String auditStatusName; + + @ExcelIgnore @ApiModelProperty("审核状态：0-审批中，1-审核通过，2-审核不通过") private Integer auditStatus; + + @ExcelIgnore @ApiModelProperty("所属大区") private String regionName; + @ExcelIgnore private Long regionId; + @ExcelIgnore private String investmentManagerId; + @ExcelIgnore @ApiModelProperty("督导") private String investmentManagerName; From 6c7449d915afa7bd81f7796d2eee1cc97f718399 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 10:01:27 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0@Async?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dto/pre/fry/ApplyManagementDTO.java | 9 +++++++++ .../store/service/impl/ExportRealizeServiceImpl.java | 1 + 2 files changed, 10 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java index f7cee8346..cfbefefbb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyManagementDTO.java @@ -2,6 +2,7 @@ package com.cool.store.dto.pre.fry; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,12 +20,15 @@ public class ApplyManagementDTO { @ExcelProperty(value = "门店编号",order = 3) @ApiModelProperty("门店Code") + @ColumnWidth(30) private String storeCode; @ExcelProperty(value = "门店名称",order = 2) @ApiModelProperty("门店名称") + @ColumnWidth(30) private String storeName; + @ColumnWidth(30) @ExcelProperty(value = "申请单号",order = 1) @ApiModelProperty("申请单号") private String applyCode; @@ -33,6 +37,7 @@ public class ApplyManagementDTO { @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜 ") private Integer applyType; + @ColumnWidth(30) @ExcelProperty(value = "申请类型",order =4) private String applyTypeName; @@ -40,14 +45,17 @@ public class ApplyManagementDTO { @ApiModelProperty("申请人ID") private String createUserId; + @ColumnWidth(30) @ExcelProperty(value = "申请人",order = 5) @ApiModelProperty("申请人名称") private String createUserName; + @ColumnWidth(30) @ExcelProperty(value = "申请人手机号",order =6) @ApiModelProperty("申请人手机号") private String createUserMobile; + @ColumnWidth(30) @ExcelProperty(value = "申请时间",order = 7) private String createTimeStr; @@ -55,6 +63,7 @@ public class ApplyManagementDTO { @ApiModelProperty("申请时间") private Date createTime; + @ColumnWidth(30) @ExcelProperty(value = "审核状态",order =8) private String auditStatusName; 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 c9387f28d..fb3adeeca 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 @@ -701,6 +701,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } @Override + @Async public void exportPreFryQualificationApply(List list, ImportTaskDO importTaskDO) { String url = ""; try { From 428e42dddf6f84d9e6e26b1c3319ea11e34871d7 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 11:08:25 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/JoinModeEnum.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java index 7f74ca33e..55ccc6993 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java @@ -11,7 +11,8 @@ public enum JoinModeEnum { FRANCHISE_COMPANIES(2,"加盟公司加盟店"), OWN_STORE(3,"加盟公司自有店"), STRONG_FRANCHISE(4,"强加盟"), - DIRECT_SALES_TO_JOINING(5,"老店转加盟") + DIRECT_SALES_TO_JOINING(5,"老店转加盟"), + AFFILIATES(6,"联营店") ; private int code; private String desc; From f598892aa5d937f49ff1863e4357feb82927507d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 11:24:47 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/BranchShopDetailRequest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java index e74e8b52a..47da9a7ab 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java @@ -24,7 +24,6 @@ public class BranchShopDetailRequest { private Long regionId; @NotNull @Min(1) - @Max(5) @ApiModelProperty("加盟模式 1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店 4- 强加盟") private Integer joinMode; @NotBlank From 55b840be274060c6871f338a00ad1038173b33a5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 8 Jul 2025 13:24:10 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/request/AddBranchShopRequest.java | 1 - .../src/main/java/com/cool/store/request/AddLineRequest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java index 75354fb76..b0a2442f7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java @@ -33,7 +33,6 @@ public class AddBranchShopRequest { @NotNull @Min(1) - @Max(5) @ApiModelProperty(" 加盟模式//'1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店',4-强加盟") private Integer joinMode; @NotBlank diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java index 058b05903..e69eb980c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java @@ -22,7 +22,7 @@ public class AddLineRequest { @NotNull @Min(1) - @Max(5) + //'1-社会加盟模式/加盟部加盟店 2-强加盟模式/加盟公司加盟店 3-加盟公司自有店', private Integer joinMode;