From 41b6179ecf6936d93294c73c70e44bc22cd66bbd Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 3 Jul 2025 15:56:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=82=B8=E7=94=B3=E8=AF=B7=E5=AF=BC?= =?UTF-8?q?=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())); + } }