From 8a143ea81615bf5555859055002da72bdd8b7b9c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 23 Jun 2025 14:25:47 +0800 Subject: [PATCH] =?UTF-8?q?desk=20=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/DecorationDesignInfoDAO.java | 5 +- .../cool/store/dao/DecorationMeasureDAO.java | 13 +- .../com/cool/store/dao/OperationLogDAO.java | 5 +- .../com/cool/store/dao/ShopStageInfoDAO.java | 5 +- .../mapper/DecorationDesignInfoMapper.java | 3 +- .../store/mapper/DecorationMeasureMapper.java | 7 +- .../cool/store/mapper/OperationLogMapper.java | 3 +- .../store/mapper/ShopStageInfoMapper.java | 3 +- .../resources/mapper/ShopStageInfoMapper.xml | 34 +++- .../com/cool/store/request/DeskRequest.java | 39 +++++ .../com/cool/store/service/DeskService.java | 72 ++++---- .../store/service/impl/DeskServiceImpl.java | 163 +++++++++--------- .../store/controller/webb/DeskController.java | 156 +++++++---------- 13 files changed, 277 insertions(+), 231 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/DeskRequest.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java index cb65f938a..060a5fcd3 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java @@ -2,6 +2,7 @@ package com.cool.store.dao; import com.cool.store.entity.DecorationDesignInfoDO; import com.cool.store.mapper.DecorationDesignInfoMapper; +import com.cool.store.request.DeskRequest; import com.cool.store.utils.StringUtil; import com.cool.store.vo.desk.PreparationCommonPendingVO; import org.apache.commons.collections4.CollectionUtils; @@ -56,11 +57,11 @@ public class DecorationDesignInfoDAO { } // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 - public List getByDesignUserIdAndShopStage(String userId, String keyword) { + public List getByDesignUserIdAndShopStage(String userId, DeskRequest deskRequest) { if (userId == null) { return new ArrayList<>(); } - return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); + return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, deskRequest); } public Integer updateDesignLeaderIdAndDesignUserIdInteger(Long shopId, String designLeaderId) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java index d5968968a..c10472ac4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java @@ -3,6 +3,7 @@ package com.cool.store.dao; import com.cool.store.entity.DecorationDesignInfoDO; import com.cool.store.entity.DecorationMeasureDO; import com.cool.store.mapper.DecorationMeasureMapper; +import com.cool.store.request.DeskRequest; import com.cool.store.utils.StringUtil; import com.cool.store.vo.desk.PreparationCommonPendingVO; import org.apache.commons.collections4.CollectionUtils; @@ -61,26 +62,26 @@ public class DecorationMeasureDAO { return decorationMeasureMapper.selectByShopId(shopId); } - public List getByMeasureUserIdAndShopStage(String measureUserId,String keyword){ + public List getByMeasureUserIdAndShopStage(String measureUserId, DeskRequest deskRequest){ if (StringUtil.isBlank(measureUserId)){ return null; } - return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,keyword); + return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,deskRequest); } //根据设计师和阶段900 查询 店铺id - public List getShopIdListByDesignUserIdAndShopStage(String userId,String keyword) { + public List getShopIdListByDesignUserIdAndShopStage(String userId, DeskRequest deskRequest) { if (StringUtil.isBlank(userId)){ return new ArrayList<>(); } - return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,keyword); + return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,deskRequest); } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 设计表关联查询 - public List getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,String keyword) { + public List getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,DeskRequest deskRequest) { if (StringUtil.isBlank(userId)){ return new ArrayList<>(); } - return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,keyword); + return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,deskRequest); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java index 544bc40a5..f034d23d0 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java @@ -6,6 +6,7 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.OperationLogMapper; +import com.cool.store.request.DeskRequest; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; @@ -63,11 +64,11 @@ public class OperationLogDAO { return operationLogMapper.getBySubStageStatusEnumAndsStatus(shopId,shopSubStageStatusEnum.getShopSubStageStatus(),type); } - public List getBySubStageStatusAndUser(String userId,List shopSubStageStatus,String keyword) { + public List getBySubStageStatusAndUser(String userId, List shopSubStageStatus, DeskRequest deskRequest) { if ( CollectionUtils.isEmpty(shopSubStageStatus)) { return null; } - return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,keyword); + return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,deskRequest); } public List getByShopSubStage(Long shopId, List shopSubStageList, List types) { if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 7325aa0ce..09f3c4a5f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -9,6 +9,7 @@ import com.cool.store.enums.point.ShopStageEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.mapper.ShopStageInfoMapper; +import com.cool.store.request.DeskRequest; import com.cool.store.vo.Preparation.PreparationProcessVO; import com.cool.store.vo.shop.RentInfoToDoVO; import com.github.pagehelper.Page; @@ -337,8 +338,8 @@ public class ShopStageInfoDAO { public List getSpecialShopStageInfo(List shopIds, Integer shopSubStage, List shopSubStageStatusList, String investmentUserId, - List authRegionIds,Boolean ownShopFlag,String keyword) { - return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, keyword); + List authRegionIds,Boolean ownShopFlag, DeskRequest deskRequest) { + return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, deskRequest); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java index 5c143728b..bbde6f0f4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.DecorationDesignInfoDO; +import com.cool.store.request.DeskRequest; import com.cool.store.vo.desk.PreparationCommonPendingVO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -17,7 +18,7 @@ public interface DecorationDesignInfoMapper extends Mapper getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); + List getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("deskRequest") DeskRequest deskRequest); /** * @Auther: wangshuo * @Date: 2025/6/16 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationMeasureMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationMeasureMapper.java index f13c9f46a..5b6b6063d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationMeasureMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationMeasureMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.DecorationMeasureDO; +import com.cool.store.request.DeskRequest; import com.cool.store.vo.desk.PreparationCommonPendingVO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -17,9 +18,9 @@ public interface DecorationMeasureMapper extends Mapper { */ DecorationMeasureDO selectByShopId(Long shopId); - List selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("keyword") String keyword); + List selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("deskRequest") DeskRequest deskRequest); - List getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); + List getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("deskRequest") DeskRequest deskRequest); - List getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); + List getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("deskRequest")DeskRequest deskRequest); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationLogMapper.java index db46b86e9..9fe86b5e5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationLogMapper.java @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.dto.OperationLogDTO; import com.cool.store.entity.OperationLogDO; +import com.cool.store.request.DeskRequest; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -24,7 +25,7 @@ public interface OperationLogMapper extends Mapper { Long batchAddOperationLog(@Param("list") List operationLogDO) ; - List getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List shopSubStageStatus,@Param("keyword")String keyword ); + List getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List shopSubStageStatus,@Param("deskRequest") DeskRequest deskRequest); OperationLogDO getByCondition(@Param("shopId") Long shopId,@Param("shopSubStageStatus") Integer shopSubStageStatus); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 5f4015bc9..89fbc7a8b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -6,6 +6,7 @@ import com.cool.store.dto.Preparation.ScheduleDTO; import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; +import com.cool.store.request.DeskRequest; import com.cool.store.vo.Preparation.PreparationProcessVO; import com.cool.store.vo.shop.RentInfoToDoVO; import com.github.pagehelper.Page; @@ -149,7 +150,7 @@ public interface ShopStageInfoMapper extends Mapper { @Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List authRegionIds, @Param("ownShopFlag") Boolean ownShopFlag, - @Param("keyword") String keyword); + @Param("request") DeskRequest deskRequest); List getSubStageList(@Param("shopIds") List shopIds,@Param("shopSubStage") Integer shopSubStage); List getSubStages(@Param("shopIds") List shopIds,@Param("shopSubStage") Integer shopSubStage); diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 730ac7c5a..1a2e0d181 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -304,6 +304,9 @@ * from xfsg_shop_stage_info a left join xfsg_shop_info si on a.shop_id = si.id + + left join xfsg_sign_info sign on a.shop_id = sign.shop_id + si.deleted = 0 and a.is_terminated = 0 and si.shop_status !=2 @@ -339,8 +342,35 @@ and si.join_mode != 3 - - and (si.shop_name like concat('%',#{keyword},'%') or si.shop_code like concat('%',#{keyword},'%')) + + and (si.shop_name like concat('%',#{request.shopKeyword},'%') or si.shop_code like concat('%',#{request.shopKeyword},'%')) + + + and si.region_id in + + #{regionId} + + + + and si.store_type in + + #{storeType} + + + + and sign.sign_type in + + #{signType} + + + + and si.investment_manager = #{request.supervisorId} + + + and si.join_mode in + + #{joinMode} + order by a.update_time desc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DeskRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DeskRequest.java new file mode 100644 index 000000000..db5d3e6d4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DeskRequest.java @@ -0,0 +1,39 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/06/23/11:13 + * @Version 1.0 + * @注释: + */ +@Data +public class DeskRequest { + + @ApiModelProperty(value = "门店名称/门店编码") + private String shopKeyword; + + @ApiModelProperty(value = "所属大区") + private List regionIds; + + @ApiModelProperty(value = "开发督导") + private String supervisorId; + + @ApiModelProperty(value = "门店类型") + private List storeType; + + @ApiModelProperty(value = "加盟模式") + private List joinModes; + + @ApiModelProperty(value = "签约类型") + private List signTypes; + + + private Integer pageNum = 1; + + private Integer pageSize = 10; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java index 248afbdd7..9def104b4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java @@ -6,6 +6,7 @@ import com.cool.store.dto.PendingCountDTO; import com.cool.store.entity.HyPartnerLabelDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.request.BusinessRemarkRequest; +import com.cool.store.request.DeskRequest; import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.desk.*; import com.github.pagehelper.PageInfo; @@ -23,8 +24,7 @@ public interface DeskService { /** * 加盟申请待处理 - * @param pageNum - * @param pageSize + * @param userId * @return */ @@ -33,8 +33,7 @@ public interface DeskService { /** * payStagePendingList - * @param pageNum - * @param pageSize + * @param user * @return */ @@ -43,8 +42,7 @@ public interface DeskService { /** * signingPendingList - * @param pageNum - * @param pageSize + * @param user * @return */ @@ -79,127 +77,121 @@ public interface DeskService { /** * 缴纳加盟费待处理数据 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo payFranchiseFeesPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 加盟合同签约待处理数据 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo signingOfFranchiseContractPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 发票回传待处理数据 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo invoiceReturnPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 开业运营方案待处理数据 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo openingAndOperationPlanPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 培训清单待处理数据 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo trainListPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 信发系统 */ - PageInfo xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo xinFaListPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * pos */ - PageInfo posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo posListPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 营帐通 */ - PageInfo tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo tentPassListPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * orderSys */ - PageInfo orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo orderSysPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 设计阶段 */ - PageInfo designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo designPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 施工阶段 */ - PageInfo constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo constructionPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 装修验收阶段 */ - PageInfo fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo fitmentPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 抖音阶段 */ - PageInfo DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo DYPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 快手 */ - PageInfo KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo KSPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 美团外卖 */ - PageInfo MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo MTPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 美团团购 */ - PageInfo MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo MTBuyPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 饿了么 */ - PageInfo ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo ELMEPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 建店资料 */ - PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo buildInformationPendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 测量阶段 - * @param pageNum - * @param pageSize + * @param user * @return */ - PageInfo measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo measurePendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 营业执照 */ - PageInfo businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo businessLicensePendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 食品安全许可证 */ - PageInfo foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo foodLicensePendingList(DeskRequest deskRequest, LoginUserInfo user ); /** * 京东外卖 */ - PageInfo JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); + PageInfo JingDongPendingList(DeskRequest deskRequest, LoginUserInfo user ); Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 55033489e..c8eea611a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -19,6 +19,7 @@ import com.cool.store.mapper.EnterpriseUserRoleMapper; import com.cool.store.mapper.IntentAgreementMapper; import com.cool.store.mapper.TrainingExperienceMapper; import com.cool.store.request.BusinessRemarkRequest; +import com.cool.store.request.DeskRequest; import com.cool.store.service.DeskService; import com.cool.store.service.RegionService; import com.cool.store.service.SysRoleService; @@ -255,15 +256,15 @@ public class DeskServiceImpl implements DeskService { @Override - public PageInfo payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo payFranchiseFeesPendingList(DeskRequest deskRequest, LoginUserInfo user ) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); PageInfo pageInfo = new PageInfo<>(); List subStageStatusList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(userRoleIds)) { //督导代填 if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { - pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE,keyword); + pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_7, + Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE); } else { if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); @@ -272,8 +273,8 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); } if (!subStageStatusList.isEmpty()) { - pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - subStageStatusList, Boolean.TRUE,keyword); + pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_7, + subStageStatusList, Boolean.TRUE); } } } @@ -281,63 +282,63 @@ public class DeskServiceImpl implements DeskService { } @Override - public PageInfo signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - PageInfo pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_8, - Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE,keyword); + public PageInfo signingOfFranchiseContractPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + PageInfo pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_8, + Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE); return pageInfo; } @Override - public PageInfo invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8_5, - Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE,keyword); + public PageInfo invoiceReturnPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_8_5, + Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE); } @Override - public PageInfo openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE,keyword); + public PageInfo openingAndOperationPlanPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE); } @Override - public PageInfo trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_5, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE,keyword); + public PageInfo trainListPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_5, + Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE ); } @Override - public PageInfo xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE,keyword); + public PageInfo xinFaListPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_23, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo posListPendingList( DeskRequest deskRequest, LoginUserInfo user ) { - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE,keyword); + return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_16, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo tentPassListPendingList( DeskRequest deskRequest, LoginUserInfo user ) { - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE,keyword); + return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_24, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE); } @Override - public PageInfo orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE,keyword); + public PageInfo orderSysPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_17, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo designPendingList( DeskRequest deskRequest, LoginUserInfo user ) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List subStageStatusList = new ArrayList<>(); //报价员和管理员不指定人，看阶段符合的全部数据 @@ -351,10 +352,10 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_903.getShopSubStageStatus()); } - return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_9, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,keyword); + return commonPendingVOPageInfo(deskRequest, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_9, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE ); } else { List list = new ArrayList<>(); - list = getDesignPendingVO(pageNum, pageSize, user, userRoleIds,keyword); + list = getDesignPendingVO(deskRequest, user, userRoleIds ); if (CollectionUtils.isEmpty(list)) { return new PageInfo<>(); @@ -389,11 +390,11 @@ public class DeskServiceImpl implements DeskService { } } - private List getDesignPendingVO(Integer pageNum, Integer pageSize, LoginUserInfo user, List userRoleIds,String keyword) { + private List getDesignPendingVO( DeskRequest deskRequest, LoginUserInfo user, List userRoleIds ) { //只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师 if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) { - PageHelper.startPage(pageNum, pageSize); - List resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(), keyword); + PageHelper.startPage(deskRequest); + List resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(),deskRequest ); List shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus())); Map> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); @@ -406,8 +407,8 @@ public class DeskServiceImpl implements DeskService { } //只有设计师 查询 指定当前用户和阶段为 901 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { - PageHelper.startPage(pageNum, pageSize); - List resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(),keyword); + PageHelper.startPage(deskRequest); + List resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(),deskRequest); List shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus())); Map> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); @@ -420,8 +421,8 @@ public class DeskServiceImpl implements DeskService { } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { - PageHelper.startPage(pageNum, pageSize); - List resultList = decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId(),keyword); + PageHelper.startPage(deskRequest); + List resultList = decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId(),deskRequest ); List shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus())); Map> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); @@ -436,51 +437,51 @@ public class DeskServiceImpl implements DeskService { } @Override - public PageInfo constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, + public PageInfo constructionPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_11, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(), - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE,keyword); + ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE); } @Override - public PageInfo fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo fitmentPendingList( DeskRequest deskRequest, LoginUserInfo user ) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE,keyword); + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_12, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()),keyword); + public PageInfo DYPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()) ); } @Override - public PageInfo KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()),keyword); + public PageInfo KSPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()) ); } @Override - public PageInfo MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()),keyword); + public PageInfo MTPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()) ); } @Override - public PageInfo MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()),keyword); + public PageInfo MTBuyPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()) ); } @Override - public PageInfo ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()),keyword); + public PageInfo ELMEPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()) ); } @Override - public PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo buildInformationPendingList( DeskRequest deskRequest, LoginUserInfo user ) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE,keyword ); + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_15, + Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE ); } //如果不是财务角色或者即是财务又是自有店财务 则不需要标识 Boolean ownShopFlag = null; @@ -515,11 +516,11 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } - return commonPendingVOPage(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,ownShopFlag,keyword); + return commonPendingVOPage(deskRequest, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,ownShopFlag ); } @Override - public PageInfo measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { + public PageInfo measurePendingList( DeskRequest deskRequest, LoginUserInfo user ) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List subStageStatusList = new ArrayList<>(); Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); @@ -529,12 +530,12 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862.getShopSubStageStatus()); } - return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_8_6, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,keyword); + return commonPendingVOPageInfo(deskRequest, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_8_6, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE); } if (userRoleIds.contains(UserRoleEnum.MEASURE_OFFICE.getCode())) { - PageHelper.startPage(pageNum, pageSize); - List list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId(),keyword); + PageHelper.startPage(deskRequest); + List list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId() , deskRequest); if (CollectionUtils.isEmpty(list)) { return new PageInfo<>(); } @@ -571,19 +572,19 @@ public class DeskServiceImpl implements DeskService { } @Override - public PageInfo businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_3, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE ,keyword); + public PageInfo businessLicensePendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_3, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_4, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE,keyword ); + public PageInfo foodLicensePendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_4, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE ); } @Override - public PageInfo JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()),keyword); + public PageInfo JingDongPendingList( DeskRequest deskRequest, LoginUserInfo user ) { + return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()) ); } @@ -620,29 +621,27 @@ public class DeskServiceImpl implements DeskService { /** * 通用查询 - * @param pageNum - * @param pageSize + * @param user * @param shopSubStageEnum * @param subStageStatusList * @param filterFlag * @return */ - private PageInfo commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag,String keyword){ - return this.commonPendingVOPage(pageNum,pageSize,user,shopSubStageEnum,subStageStatusList,filterFlag,null,keyword); + private PageInfo commonPendingVOPageInfo( DeskRequest deskRequest, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag ){ + return this.commonPendingVOPage(deskRequest,user,shopSubStageEnum,subStageStatusList,filterFlag,null ); } /** * 通用查询 * - * @param pageNum - * @param pageSize + * @param user * @param shopSubStageEnum * @param subStageStatusList * @return */ - private PageInfo commonPendingVOPage(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag,Boolean ownShopFlag,String keyword) { + private PageInfo commonPendingVOPage( DeskRequest deskRequest, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag,Boolean ownShopFlag ) { //user.getJobNumber() List authRegionIds = new ArrayList<>(); if (filterFlag) { @@ -650,9 +649,9 @@ public class DeskServiceImpl implements DeskService { authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); } } - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(deskRequest); List specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), - subStageStatusList, user == null ? null : user.getUserId(), authRegionIds,ownShopFlag,keyword); + subStageStatusList, user == null ? null : user.getUserId(), authRegionIds,ownShopFlag,deskRequest ); PageInfo result = new PageInfo<>(specialShopStageInfo); List shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); @@ -740,9 +739,9 @@ public class DeskServiceImpl implements DeskService { } //平台建店通用查询 - private PageInfo commonPlatformBuild(Integer pageNum, Integer pageSize, LoginUserInfo user, List subStageStatusList,String keyword) { - PageHelper.startPage(pageNum, pageSize); - List operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList,keyword); + private PageInfo commonPlatformBuild( DeskRequest deskRequest, LoginUserInfo user, List subStageStatusList ) { + PageHelper.startPage(deskRequest); + List operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList,deskRequest); if (CollectionUtils.isEmpty(operationLogDOList)) { return new PageInfo<>(); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java index a4c34f587..5e7d98e61 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java @@ -5,6 +5,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dto.InvestmentCountDTO; import com.cool.store.dto.PendingCountDTO; import com.cool.store.request.BusinessRemarkRequest; +import com.cool.store.request.DeskRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.DeskService; import com.cool.store.vo.desk.*; @@ -74,179 +75,156 @@ public class DeskController { } @ApiOperation("待处理-支付加盟费保证金") - @GetMapping("/payFranchiseFeesPendingList") - public ResponseResult> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , - @RequestParam(value = "keyword") String keyword) { + @PostMapping("/payFranchiseFeesPendingList") + public ResponseResult> payFranchiseFeesPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.payFranchiseFeesPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-签约加盟合同") - @GetMapping("/signingOfFranchiseContractPendingList") - public ResponseResult> signingOfFranchiseContractPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/signingOfFranchiseContractPendingList") + public ResponseResult> signingOfFranchiseContractPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.signingOfFranchiseContractPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.signingOfFranchiseContractPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-发票回传") - @GetMapping("/invoiceReturnPendingList") - public ResponseResult> invoiceReturnPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/invoiceReturnPendingList") + public ResponseResult> invoiceReturnPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.invoiceReturnPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.invoiceReturnPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-开店运营方案") - @GetMapping("/openingAndOperationPlanPendingList") - public ResponseResult> openingAndOperationPlanPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/openingAndOperationPlanPendingList") + public ResponseResult> openingAndOperationPlanPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.openingAndOperationPlanPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-培训登记") - @GetMapping("/trainListPendingList") - public ResponseResult> trainListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/trainListPendingList") + public ResponseResult> trainListPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.trainListPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.trainListPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-信发系统") - @GetMapping("/xinFaListPendingList") - public ResponseResult> xinFaListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/xinFaListPendingList") + public ResponseResult> xinFaListPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.xinFaListPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.xinFaListPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-pos") - @GetMapping("/posListPendingList") - public ResponseResult> posListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/posListPendingList") + public ResponseResult> posListPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.posListPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.posListPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-营帐通") - @GetMapping("/tentPassListPendingList") - public ResponseResult> tentPassListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/tentPassListPendingList") + public ResponseResult> tentPassListPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.tentPassListPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.tentPassListPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-订货系统") - @GetMapping("/orderSysPendingList") - public ResponseResult> orderSysPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/orderSysPendingList") + public ResponseResult> orderSysPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.orderSysPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.orderSysPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-设计阶段") - @GetMapping("/designPendingList") - public ResponseResult> designPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/designPendingList") + public ResponseResult> designPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.designPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.designPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-施工阶段") - @GetMapping("/constructionPendingList") - public ResponseResult> constructionPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/constructionPendingList") + public ResponseResult> constructionPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.constructionPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.constructionPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-装修验收阶段") - @GetMapping("/fitmentPendingList") - public ResponseResult> fitmentPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/fitmentPendingList") + public ResponseResult> fitmentPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.fitmentPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.fitmentPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-抖音阶段") - @GetMapping("/DYPendingList") - public ResponseResult> DYPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/DYPendingList") + public ResponseResult> DYPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.DYPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.DYPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-快手") - @GetMapping("/KSPendingList") - public ResponseResult> KSPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/KSPendingList") + public ResponseResult> KSPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.KSPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.KSPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-美团外卖") - @GetMapping("/MTPendingList") - public ResponseResult> MTPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/MTPendingList") + public ResponseResult> MTPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.MTPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.MTPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-美团团购") - @GetMapping("/MTBuyPendingList") - public ResponseResult> MTButPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/MTBuyPendingList") + public ResponseResult> MTButPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.MTBuyPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.MTBuyPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-饿了么") - @GetMapping("/ELMEPendingList") - public ResponseResult> ELMEPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/ELMEPendingList") + public ResponseResult> ELMEPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.ELMEPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.ELMEPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-建店资料") - @GetMapping("/buildInformationPendingList") - public ResponseResult> buildInformationPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/buildInformationPendingList") + public ResponseResult> buildInformationPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.buildInformationPendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.buildInformationPendingList( deskRequest, userInfo )); } @ApiOperation("待处理-测量阶段") - @GetMapping("/measurePendingList") - public ResponseResult> measurePendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, - @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) { + @PostMapping("/measurePendingList") + public ResponseResult> measurePendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.measurePendingList(pageNumber, pageSize, userInfo,keyword)); + return ResponseResult.success(deskService.measurePendingList( deskRequest, userInfo )); } @ApiOperation("待处理-营业执照") - @GetMapping("/businessLicensePendingList") - public ResponseResult> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword){ + @PostMapping("/businessLicensePendingList") + public ResponseResult> businessLicensePendingList(@RequestBody DeskRequest deskRequest){ LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo,keyword)); + return ResponseResult.success(deskService.businessLicensePendingList(deskRequest,userInfo )); } @ApiOperation("待处理-食品许可证") - @GetMapping("/foodLicensePendingList") - public ResponseResult> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) { + @PostMapping("/foodLicensePendingList") + public ResponseResult> foodLicensePendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo,keyword)); + return ResponseResult.success(deskService.foodLicensePendingList(deskRequest,userInfo )); } @ApiOperation("待处理-京东外卖") - @GetMapping("/JingDongPendingList") - public ResponseResult> JingDongPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) { + @PostMapping("/JingDongPendingList") + public ResponseResult> JingDongPendingList(@RequestBody DeskRequest deskRequest) { LoginUserInfo userInfo = CurrentUserHolder.getUser(); - return ResponseResult.success(deskService.JingDongPendingList(pageNumber,pageSize,userInfo,keyword)); + return ResponseResult.success(deskService.JingDongPendingList(deskRequest,userInfo )); } @ApiOperation("提交业务备注") @PostMapping("/submitBusinessRemark")