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 16d531ae5..97800380a 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 @@ -54,12 +54,12 @@ public class DecorationDesignInfoDAO { return decorationDesignInfoMapper.selectByShopId(shopId); } - // 根据报价员人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 - public List getByQuotationUserIdAndShopStage(String userId){ + // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 + public List getByDesignUserIdAndShopStage(String userId){ if(userId == null){ return new ArrayList<>(); } - return decorationDesignInfoMapper.getByQuotationUserIdAndShopStage(userId); + return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId); } 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 dae9bf37f..c400e2192 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 getByQuotationUserIdAndShopStage(@Param("userId") String userId); + List getByDesignUserIdAndShopStage(@Param("userId") String userId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index c8fd17d8f..4239cf90c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -33,7 +33,7 @@ * from xfsg_decoration_design_info where shop_id = #{shopId} and deleted = 0 - select c.shop_name as storeName, c.shop_code as ShopCode, @@ -51,7 +51,7 @@ from xfsg_decoration_design_info a left join xfsg_shop_stage_info b on a.shop_id = b.shop_id left join xfsg_shop_info c on a.shop_id = c.id - where a.quotation_user_id = #{userId} + where a.design_user_id = #{userId} and b.shop_sub_stage_status = 901 and c.deleted = 0 order by b.update_time desc 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 615e228a2..d24f38cd1 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 @@ -447,7 +447,7 @@ public class DeskServiceImpl implements DeskService { //只有设计师 查询 指定当前用户和阶段为 901 设计中 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { PageHelper.startPage(pageNum, pageSize); - return decorationDesignInfoDAO.getByQuotationUserIdAndShopStage(user.getUserId()); + return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId()); } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {