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

desk 部分接口改造

Browse Source
This commit is contained in:
shuo.wang
2025-06-23 14:25:47 +08:00
parent ab3218f33c
commit 8a143ea816
13 changed files with 277 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<PreparationCommonPendingVO> getByDesignUserIdAndShopStage(String userId, String keyword) {
public List<PreparationCommonPendingVO> 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) {

13
coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationMeasureDAO.java
View File

@@ -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<PreparationCommonPendingVO> getByMeasureUserIdAndShopStage(String measureUserId,String keyword){
public List<PreparationCommonPendingVO> 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<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(String userId,String keyword) {
public List<PreparationCommonPendingVO> 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<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,String keyword) {
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,DeskRequest deskRequest) {
if (StringUtil.isBlank(userId)){
return new ArrayList<>();
}
return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,keyword);
return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,deskRequest);
}
}

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/OperationLogDAO.java
View File

@@ -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<OperationLogDO> getBySubStageStatusAndUser(String userId,List<Integer> shopSubStageStatus,String keyword) {
public List<OperationLogDO> getBySubStageStatusAndUser(String userId, List<Integer> shopSubStageStatus, DeskRequest deskRequest) {
if ( CollectionUtils.isEmpty(shopSubStageStatus)) {
return null;
}
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,keyword);
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,deskRequest);
}
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) {

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -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<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,
String investmentUserId,
List<String> authRegionIds,Boolean ownShopFlag,String keyword) {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, keyword);
List<String> authRegionIds,Boolean ownShopFlag, DeskRequest deskRequest) {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, deskRequest);
}
/**

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

@@ -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<DecorationDesignInfoD
*/
DecorationDesignInfoDO selectByShopId(Long shopId);
List<PreparationCommonPendingVO> getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("deskRequest") DeskRequest deskRequest);
/**
* @Auther: wangshuo
* @Date: 2025/6/16

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationMeasureMapper.java
View File

@@ -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> {
*/
DecorationMeasureDO selectByShopId(Long shopId);
List<PreparationCommonPendingVO> selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("deskRequest") DeskRequest deskRequest);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("deskRequest") DeskRequest deskRequest);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("deskRequest")DeskRequest deskRequest);
}

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/OperationLogMapper.java
View File

@@ -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<OperationLogDO> {
Long batchAddOperationLog(@Param("list") List<OperationLogDO> operationLogDO) ;
List<OperationLogDO> getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List<Integer> shopSubStageStatus,@Param("keyword")String keyword );
List<OperationLogDO> getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List<Integer> shopSubStageStatus,@Param("deskRequest") DeskRequest deskRequest);
OperationLogDO getByCondition(@Param("shopId") Long shopId,@Param("shopSubStageStatus") Integer shopSubStageStatus);
}

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
View File

@@ -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<ShopStageInfoDO> {
@Param("investmentUserId") String investmentUserId,
@Param("authRegionIds") List<String> authRegionIds,
@Param("ownShopFlag") Boolean ownShopFlag,
@Param("keyword") String keyword);
@Param("request") DeskRequest deskRequest);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);

34
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -304,6 +304,9 @@
*
from xfsg_shop_stage_info a
left join xfsg_shop_info si on a.shop_id = si.id
<if test="request.signTypes != null and request.signTypes.size() >0">
left join xfsg_sign_info sign on a.shop_id = sign.shop_id
</if>
<where>
si.deleted = 0 and a.is_terminated = 0 and si.shop_status !=2
<if test="shopIds != null and shopIds.size() > 0">
@@ -339,8 +342,35 @@
and si.join_mode != 3
</if>
</if>
<if test="keyword!=null and keyword !=''">
and (si.shop_name like concat('%',#{keyword},'%') or si.shop_code like concat('%',#{keyword},'%'))
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (si.shop_name like concat('%',#{request.shopKeyword},'%') or si.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and si.region_id in
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId}
</foreach>
</if>
<if test="request.storeTypes !=null and request.storeTypes.size()>0">
and si.store_type in
<foreach collection="request.storeTypes" item="storeType" index="index" open="(" separator="," close=")">
#{storeType}
</foreach>
</if>
<if test="request.signTypes !=null and request.signTypes.size()>0">
and sign.sign_type in
<foreach collection="request.signTypes" item="signType" index="index" open="(" separator="," close=")">
#{signType}
</foreach>
</if>
<if test="request.supervisorId != null and request.supervisorId!= ''">
and si.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and si.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if>
order by a.update_time desc
</where>