From e281730b84c0f2986b052c089ec5a1c203523b6b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 27 May 2025 13:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/DecorationDesignInfoDAO.java | 4 +- .../cool/store/dao/DecorationMeasureDAO.java | 12 +- .../java/com/cool/store/dao/LineInfoDAO.java | 4 +- .../com/cool/store/dao/OperationLogDAO.java | 4 +- .../com/cool/store/dao/ShopStageInfoDAO.java | 4 +- .../mapper/DecorationDesignInfoMapper.java | 2 +- .../store/mapper/DecorationMeasureMapper.java | 6 +- .../com/cool/store/mapper/LineInfoMapper.java | 2 +- .../cool/store/mapper/OperationLogMapper.java | 2 +- .../store/mapper/ShopStageInfoMapper.java | 3 +- .../mapper/DecorationDesignInfoMapper.xml | 3 + .../mapper/DecorationMeasureMapper.xml | 9 + .../main/resources/mapper/LineInfoMapper.xml | 3 + .../resources/mapper/OperationLogMapper.xml | 3 + .../resources/mapper/ShopStageInfoMapper.xml | 3 + .../cool/store/vo/desk/IntendPendingVO.java | 3 + .../cool/store/vo/desk/PayStagePendingVO.java | 2 + .../vo/desk/PreparationCommonPendingVO.java | 3 +- .../cool/store/vo/desk/SigningPendingVO.java | 3 +- .../com/cool/store/service/DeskService.java | 44 ++--- .../store/service/impl/DeskServiceImpl.java | 112 ++++++------- .../store/controller/webb/DeskController.java | 154 ++++++++++-------- 22 files changed, 214 insertions(+), 171 deletions(-) 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 97800380a..46eb2bc58 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 @@ -55,11 +55,11 @@ public class DecorationDesignInfoDAO { } // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 - public List getByDesignUserIdAndShopStage(String userId){ + public List getByDesignUserIdAndShopStage(String userId, String keyword){ if(userId == null){ return new ArrayList<>(); } - return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId); + return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); } 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 bf8f3ad62..d5968968a 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 @@ -61,26 +61,26 @@ public class DecorationMeasureDAO { return decorationMeasureMapper.selectByShopId(shopId); } - public List getByMeasureUserIdAndShopStage(String measureUserId){ + public List getByMeasureUserIdAndShopStage(String measureUserId,String keyword){ if (StringUtil.isBlank(measureUserId)){ return null; } - return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId); + return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,keyword); } //根据设计师和阶段900 查询 店铺id - public List getShopIdListByDesignUserIdAndShopStage(String userId) { + public List getShopIdListByDesignUserIdAndShopStage(String userId,String keyword) { if (StringUtil.isBlank(userId)){ return new ArrayList<>(); } - return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId); + return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,keyword); } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 设计表关联查询 - public List getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId) { + public List getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,String keyword) { if (StringUtil.isBlank(userId)){ return new ArrayList<>(); } - return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId); + return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,keyword); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index caeeb0799..d905f75f8 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -119,11 +119,11 @@ public class LineInfoDAO { return null; } - public List listByInvestmentManager(String investmentManagerUserId,List subStageStatus) { + public List listByInvestmentManager(String investmentManagerUserId,List subStageStatus,String keyword) { if (StringUtils.isBlank(investmentManagerUserId)){ return null; } - List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); + List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword); return lineInfo; } public List listByInterview(String interviewId, Integer interviewType,List pendingInterviewStatusList, 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 2a8b92723..544bc40a5 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 @@ -63,11 +63,11 @@ public class OperationLogDAO { return operationLogMapper.getBySubStageStatusEnumAndsStatus(shopId,shopSubStageStatusEnum.getShopSubStageStatus(),type); } - public List getBySubStageStatusAndUser(String userId,List shopSubStageStatus) { + public List getBySubStageStatusAndUser(String userId,List shopSubStageStatus,String keyword) { if ( CollectionUtils.isEmpty(shopSubStageStatus)) { return null; } - return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus); + return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,keyword); } 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 2cc239255..4369f2114 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 @@ -337,8 +337,8 @@ public class ShopStageInfoDAO { public List getSpecialShopStageInfo(List shopIds, Integer shopSubStage, List shopSubStageStatusList, String investmentUserId, - List authRegionIds,Boolean ownShopFlag) { - return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag); + List authRegionIds,Boolean ownShopFlag,String keyword) { + return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, keyword); } /** 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 c400e2192..604e913e4 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 @@ -17,6 +17,6 @@ public interface DecorationDesignInfoMapper extends Mapper getByDesignUserIdAndShopStage(@Param("userId") String userId); + List getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); } \ No newline at end of file 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 51efdf761..f13c9f46a 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 @@ -17,9 +17,9 @@ public interface DecorationMeasureMapper extends Mapper { */ DecorationMeasureDO selectByShopId(Long shopId); - List selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId); + List selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("keyword") String keyword); - List getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId); + List getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); - List getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId); + List getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index 739cec392..8af450bef 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -29,7 +29,7 @@ public interface LineInfoMapper extends Mapper { * @param investmentManagerUserId * @return */ - List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List codes); + List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List codes,@Param("keyword")String keyword); /** * 面试官待处理 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 bf8f2194c..db46b86e9 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 @@ -24,7 +24,7 @@ public interface OperationLogMapper extends Mapper { Long batchAddOperationLog(@Param("list") List operationLogDO) ; - List getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List shopSubStageStatus ); + List getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List shopSubStageStatus,@Param("keyword")String keyword ); 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 56887b60c..5f4015bc9 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 @@ -148,7 +148,8 @@ public interface ShopStageInfoMapper extends Mapper { @Param("shopSubStageStatusList") List shopSubStageStatusList, @Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List authRegionIds, - @Param("ownShopFlag") Boolean ownShopFlag); + @Param("ownShopFlag") Boolean ownShopFlag, + @Param("keyword") String keyword); 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/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index ce1ee04dc..2141ae8c4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -56,6 +56,9 @@ and b.shop_sub_stage_status = 901 and c.deleted = 0 and c.shop_status !=2 + + and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) + order by b.update_time desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml index 7035eb88e..0c2e26bb5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml @@ -52,6 +52,9 @@ and b.shop_sub_stage_status = 892 and c.deleted = 0 and c.shop_status !=2 + + and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) + order by b.update_time desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index ae1833483..374299ce4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -353,6 +353,9 @@ #{code} + + and (username like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%')) + order by update_time desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml index 5a95c866a..7bc43723a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml @@ -90,6 +90,9 @@ #{item} and a.status = 0 + + and (b.shop_code like concat('%',#{keyword},'%') or b.shop_name like concat('%',#{keyword},'%')) + order by a.create_time desc