From 75bb2374e3c566099db5484bbb5aa73ac3436160 Mon Sep 17 00:00:00 2001 From: DB <2502523450@qq.com> Date: Wed, 20 Dec 2023 19:21:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4Oam=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BF=AE=E8=AE=A2=E6=94=BE=E5=BF=83?= =?UTF-8?q?=E5=AD=A6=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jambox/business/bo/EasyLearnPageBo.java | 15 ++++++ .../controller/EasyLearnController.java | 9 ++-- .../service/EasyLearnOrderService.java | 4 +- .../impl/EasyLearnOrderServiceImpl.java | 46 +++++++++---------- .../service/impl/BusinessServiceImpl.java | 15 ++++-- .../cpop/oam/framework/config/InitConfig.java | 3 ++ .../system/business/bo/StoreRenewPageBo.java | 12 ++++- .../system/business/bo/StoreRenewXmlBo.java | 8 +++- .../service/impl/StoreSignServiceImpl.java | 9 ++-- 9 files changed, 80 insertions(+), 41 deletions(-) diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnPageBo.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnPageBo.java index c573199..426ec7a 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnPageBo.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/bo/EasyLearnPageBo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -22,6 +23,20 @@ import java.util.List; @ApiModel(value = "EasyLearnPageBo对象", description = "放心学分页查询参数") public class EasyLearnPageBo { + /** + * 结束日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "结束日期") + private LocalDate endDate; + + /** + * 开始日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "开始日期") + private LocalDate startDate; + /** * 顾问 */ diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/EasyLearnController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/EasyLearnController.java index 162979b..3921032 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/EasyLearnController.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/EasyLearnController.java @@ -47,8 +47,8 @@ public class EasyLearnController { */ @ApiOperation("查询放心学分页") @GetMapping("/getEasyLearnPage") - public R> getEasyLearnPage(@RequestParam(value = "startAndEnd",required = false) List startAndEnd, @Validated EasyLearnPageBo bo) { - Page page = easyLearnOrderService.getEasyLearnPage(startAndEnd, bo); + public R> getEasyLearnPage(@Validated EasyLearnPageBo bo) { + Page page = easyLearnOrderService.getEasyLearnPage(bo); return R.ok(page); } @@ -61,8 +61,7 @@ public class EasyLearnController { */ @GetMapping("/getEasyLearnXml") @ApiOperation("导出放心学数据") - public void getEasyLearnXml(HttpServletResponse response, @RequestParam(value = "startAndEnd", required = false) List startAndEnd, - @ApiParam("分页查询条件") @Validated EasyLearnPageBo bo) throws IOException { + public void getEasyLearnXml(HttpServletResponse response, @ApiParam("分页查询条件") @Validated EasyLearnPageBo bo) throws IOException { // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); @@ -88,6 +87,6 @@ public class EasyLearnController { } String fileName = URLEncoder.encode(fileFullName + "数据", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), EasyLearnPageDto.class).sheet("记录").doWrite(easyLearnOrderService.getEasyLearnXml(startAndEnd, bo)); + EasyExcel.write(response.getOutputStream(), EasyLearnPageDto.class).sheet("记录").doWrite(easyLearnOrderService.getEasyLearnXml(bo)); } } diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java index 8d28885..57d833c 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/EasyLearnOrderService.java @@ -26,7 +26,7 @@ public interface EasyLearnOrderService extends IService { * @param bo 查询参数 * @return Page */ - Page getEasyLearnPage(List startAndEnd,EasyLearnPageBo bo); + Page getEasyLearnPage(EasyLearnPageBo bo); /** * 导出放心学数据 @@ -35,5 +35,5 @@ public interface EasyLearnOrderService extends IService { * @param bo 请求参数 * @return List */ - List getEasyLearnXml(List startAndEnd,EasyLearnPageBo bo); + List getEasyLearnXml(EasyLearnPageBo bo); } diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java index 3a28afc..6682d2d 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java @@ -48,9 +48,9 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl getEasyLearnPage(List startAndEnd, EasyLearnPageBo bo) { + public Page getEasyLearnPage(EasyLearnPageBo bo) { //TODO: 后续数据录入后，应该查询新版中的数据 - return getOldEasyLearnPage(startAndEnd, bo); + return getOldEasyLearnPage(bo); } /** @@ -62,9 +62,9 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl getEasyLearnXml(List startAndEnd, EasyLearnPageBo bo) { + public List getEasyLearnXml(EasyLearnPageBo bo) { //TODO: 后续数据录入后，应该查询新版中的数据 - return getOldEasyLearnXml(startAndEnd, bo); + return getOldEasyLearnXml(bo); } /** @@ -75,7 +75,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl getOldEasyLearnXml(List startAndEnd, EasyLearnPageBo bo) { + private List getOldEasyLearnXml(EasyLearnPageBo bo) { //TODO: 暂时不处理顾问 try { getJamboxProdDataSource(); @@ -84,14 +84,14 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl getOldEasyLearnPage(List startAndEnd,EasyLearnPageBo bo) { + private Page getOldEasyLearnPage(EasyLearnPageBo bo) { //TODO: 暂时不处理顾问 try { getJamboxProdDataSource(); @@ -141,14 +141,14 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl item.toEntity(EasyLearnPageVo.class)); + return Db.paginate("j_commodity_ticket", page, getLearnNowPayLaterData(false, bo)).map(item -> item.toEntity(EasyLearnPageVo.class)); } finally { DataSourceKey.clear(); } case 1: try { DataSourceKey.use("jamboxProd"); - return Db.paginate("j_commodity_ticket", page, getLearnNowPayLaterData(startAndEnd,true, bo)).map(item -> item.toEntity(EasyLearnPageVo.class)); + return Db.paginate("j_commodity_ticket", page, getLearnNowPayLaterData(true, bo)).map(item -> item.toEntity(EasyLearnPageVo.class)); } finally { DataSourceKey.clear(); } @@ -158,7 +158,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl item.toEntity(EasyLearnPageVo.class)); + return Db.paginate("j_commodity_ticket", page, getEcppData(bo)).map(item -> item.toEntity(EasyLearnPageVo.class)); } finally { DataSourceKey.clear(); } @@ -166,7 +166,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl item.toEntity(EasyLearnPageVo.class)); + return Db.paginate("j_commodity_ticket", page, getMemberData(bo)).map(item -> item.toEntity(EasyLearnPageVo.class)); } finally { DataSourceKey.clear(); } @@ -178,7 +178,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl startAndEnd, EasyLearnPageBo bo) { + private QueryWrapper getMemberData(EasyLearnPageBo bo) { QueryWrapper queryWrapper = QueryWrapper.create(); queryWrapper //查询品牌校区 @@ -192,8 +192,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl startAndEnd,EasyLearnPageBo bo) { + private QueryWrapper getEcppData(EasyLearnPageBo bo) { QueryWrapper queryWrapper = QueryWrapper.create(); queryWrapper //查询品牌校区 @@ -230,8 +230,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl startAndEnd,Boolean isMonth, EasyLearnPageBo bo) { + private QueryWrapper getLearnNowPayLaterData(Boolean isMonth, EasyLearnPageBo bo) { QueryWrapper queryWrapper = QueryWrapper.create() //查询品牌校区 .select("tbi.name as brandName", "tmi.mechanism as storeName") @@ -273,8 +273,8 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl i @Override public Page getBusinessPage(Integer status) { PageDomain pageDomain = SqlUtils.getInstance().getPageDomain(); + //查询员工 + JSONObject loginUserInfo = SecurityUtils.getInstance().getLoginUserInfo(); + QueryWrapper queryWrapper = QueryWrapper.create(); + //运营人员 + if (loginUserInfo.getInteger("staffType") == 1) { + queryWrapper.leftJoin(BUSINESS_STAFF).on(BUSINESS_STAFF.BUSINESS_ID.eq(BUSINESS.ID)) + .and(BUSINESS_STAFF.STAFF_ID.eq(loginUserInfo.getString("id"))); + } return this.mapper.paginateAs(Page.of(pageDomain.getPageNum(), pageDomain.getPageSize()), - QueryWrapper.create() + queryWrapper .select(BUSINESS.ID, BUSINESS.BUSINESS_LEVEL, BUSINESS.BUSINESS_TYPE, BUSINESS.DESC, BUSINESS.START_DATE, BUSINESS.END_DATE, BUSINESS.ALL_SURPLUS_QUANTITY, BUSINESS.REMARK, BUSINESS.STATUS) //员工表 .select(STAFF.NAME.as(BusinessPageVo::getInitiatorName)) @@ -228,13 +236,13 @@ public class BusinessServiceImpl extends ServiceImpl i //运营人员 if (loginUserInfo.getInteger("staffType") == 1) { //查询自己处理中的校区的记录 - queryWrapper.and(BUSINESS_STAFF.STAFF_ID.eq(loginUserInfo.getString("id")) + queryWrapper.and(BUSINESS_STAFF.STAFF_ID.eq(loginUserInfo.getString("id"))) //获取所有无人处理的校区 .or(STORE.ID.notIn(select(BUSINESS_DETAIL.STORE_ID) .from(BUSINESS_DETAIL) .leftJoin(BUSINESS_STAFF).on(BUSINESS_STAFF.BUSINESS_ID.eq(BUSINESS_DETAIL.BUSINESS_ID)) .where(BUSINESS_STAFF.STAFF_ID.ne(loginUserInfo.getString("id"))) - ))); + )); } PageDomain pageDomain = SqlUtils.getInstance().getPageDomain(); return SpringUtils.getBean(StoreService.class).getMapper().paginateAs(Page.of(pageDomain.getPageNum(), pageDomain.getPageSize()), @@ -258,6 +266,7 @@ public class BusinessServiceImpl extends ServiceImpl i //未签约-非测试 .and(STORE.IS_TEST.eq(false)) .and(STORE.HAVE_ACTIVE.eq(false)) + .and(BUSINESS_DETAIL.DETAIL_STATUS.eq(bo.getDetailStatus())) .orderBy(BUSINESS_DETAIL.CREATE_TIME.asc()), BusinessInfoPageVo.class); diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java index 09a966d..ffce44d 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java @@ -8,6 +8,8 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.time.Duration; + import static org.springframework.integration.config.xml.IntegrationNamespaceUtils.ROLE; /** @@ -39,4 +41,5 @@ public class InitConfig { } } } + } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewPageBo.java b/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewPageBo.java index e60e13d..9a5899e 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewPageBo.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewPageBo.java @@ -1,9 +1,11 @@ package com.cpop.system.business.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDate; @@ -36,10 +38,18 @@ public class StoreRenewPageBo { @ApiModelProperty(value = "续费状态",required = true) private Integer renewStatus; + /** + * 续费开始日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "续费开始日期") + private LocalDate startDate; + /** * 续费结束日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "续费结束日期") - private List renewStartAndEnd; + private LocalDate endDate; } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewXmlBo.java b/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewXmlBo.java index 822baef..fa8cae4 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewXmlBo.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/bo/StoreRenewXmlBo.java @@ -1,9 +1,11 @@ package com.cpop.system.business.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDate; @@ -32,12 +34,14 @@ public class StoreRenewXmlBo { /** * 续费结束日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "续费结束日期") - private LocalDate renewStartDate; + private LocalDate startDate; /** * 续费开始日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "续费开始日期") - private LocalDate renewEndDate; + private LocalDate endDate; } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreSignServiceImpl.java b/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreSignServiceImpl.java index 0c87cbb..e286781 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreSignServiceImpl.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/service/impl/StoreSignServiceImpl.java @@ -55,8 +55,8 @@ public class StoreSignServiceImpl extends ServiceImpl getRenewXml(StoreRenewXmlBo bo) { - List storeRenewDtos = SpringUtils.getBean(StoreRenewService.class).listAs(QueryWrapper.create() + return SpringUtils.getBean(StoreRenewService.class).listAs(QueryWrapper.create() .select(BRAND.BRAND_NAME) .select(STORE.CREATE_TIME.as(StoreRenewDto::getCreateTime), STORE.PERSON_CHARGE, STORE.PHONE, STORE.STORE_NAME) .select(STORE_SIGN.EXPIRE_DATE, STORE_SIGN.ID) @@ -131,10 +131,9 @@ public class StoreSignServiceImpl extends ServiceImpl