suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-05-07 17:28:56 +08:00
parent cd3d0f2934
commit 83585ff95b
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java
View File

@@ -54,12 +54,12 @@ public class DecorationDesignInfoDAO {
return decorationDesignInfoMapper.selectByShopId(shopId); return decorationDesignInfoMapper.selectByShopId(shopId);
} }
// 根据报价员人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息
public List<PreparationCommonPendingVO> getByQuotationUserIdAndShopStage(String userId){ public List<PreparationCommonPendingVO> getByDesignUserIdAndShopStage(String userId){
if(userId == null){ if(userId == null){
return new ArrayList<>(); return new ArrayList<>();
} }
return decorationDesignInfoMapper.getByQuotationUserIdAndShopStage(userId); return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId);
} }

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java
View File

@@ -17,6 +17,6 @@ public interface DecorationDesignInfoMapper extends Mapper<DecorationDesignInfoD
*/ */
DecorationDesignInfoDO selectByShopId(Long shopId); DecorationDesignInfoDO selectByShopId(Long shopId);
List<PreparationCommonPendingVO> getByQuotationUserIdAndShopStage(@Param("userId") String userId); List<PreparationCommonPendingVO> getByDesignUserIdAndShopStage(@Param("userId") String userId);
} }

4
coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml
View File

@@ -33,7 +33,7 @@
* *
from xfsg_decoration_design_info where shop_id = #{shopId} and deleted = 0 from xfsg_decoration_design_info where shop_id = #{shopId} and deleted = 0
</select> </select>
<select id="getByQuotationUserIdAndShopStage" resultType="com.cool.store.vo.desk.PreparationCommonPendingVO"> <select id="getByDesignUserIdAndShopStage" resultType="com.cool.store.vo.desk.PreparationCommonPendingVO">
select select
c.shop_name as storeName, c.shop_name as storeName,
c.shop_code as ShopCode, c.shop_code as ShopCode,
@@ -51,7 +51,7 @@
from xfsg_decoration_design_info a from xfsg_decoration_design_info a
left join xfsg_shop_stage_info b on a.shop_id = b.shop_id 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 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 b.shop_sub_stage_status = 901
and c.deleted = 0 and c.deleted = 0
order by b.update_time desc order by b.update_time desc

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -447,7 +447,7 @@ public class DeskServiceImpl implements DeskService {
//只有设计师 查询 指定当前用户和阶段为 901 设计中 //只有设计师 查询 指定当前用户和阶段为 901 设计中
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
return decorationDesignInfoDAO.getByQuotationUserIdAndShopStage(user.getUserId()); return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId());
} }
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {