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

Merge branch 'cc_20250623_desk' into 'master'

Browse Source 
Cc 20250623 desk

See merge request hangzhou/java/custom_zxjp!121
This commit is contained in:
苏竹红
2025-06-30 12:05:29 +00:00
parent 3f2f0765e5 1be605e5d1
commit 521a51ae55
17 changed files with 523 additions and 273 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.entity.DecorationDesignInfoDO;
import com.cool.store.mapper.DecorationDesignInfoMapper; import com.cool.store.mapper.DecorationDesignInfoMapper;
import com.cool.store.request.DeskRequest;
import com.cool.store.utils.StringUtil; import com.cool.store.utils.StringUtil;
import com.cool.store.vo.desk.PreparationCommonPendingVO; import com.cool.store.vo.desk.PreparationCommonPendingVO;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -56,11 +57,11 @@ public class DecorationDesignInfoDAO {
} }
// 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 // 根据设计师人员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) { if (userId == null) {
return new ArrayList<>(); return new ArrayList<>();
} }
return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, deskRequest);
} }
public Integer updateDesignLeaderIdAndDesignUserIdInteger(Long shopId, String designLeaderId) { 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.DecorationDesignInfoDO;
import com.cool.store.entity.DecorationMeasureDO; import com.cool.store.entity.DecorationMeasureDO;
import com.cool.store.mapper.DecorationMeasureMapper; import com.cool.store.mapper.DecorationMeasureMapper;
import com.cool.store.request.DeskRequest;
import com.cool.store.utils.StringUtil; import com.cool.store.utils.StringUtil;
import com.cool.store.vo.desk.PreparationCommonPendingVO; import com.cool.store.vo.desk.PreparationCommonPendingVO;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -61,26 +62,26 @@ public class DecorationMeasureDAO {
return decorationMeasureMapper.selectByShopId(shopId); return decorationMeasureMapper.selectByShopId(shopId);
} }
public List<PreparationCommonPendingVO> getByMeasureUserIdAndShopStage(String measureUserId,String keyword){ public List<PreparationCommonPendingVO> getByMeasureUserIdAndShopStage(String measureUserId, DeskRequest deskRequest){
if (StringUtil.isBlank(measureUserId)){ if (StringUtil.isBlank(measureUserId)){
return null; return null;
} }
return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,keyword); return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,deskRequest);
} }
//根据设计师和阶段900 查询 店铺id //根据设计师和阶段900 查询 店铺id
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(String userId,String keyword) { public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(String userId, DeskRequest deskRequest) {
if (StringUtil.isBlank(userId)){ if (StringUtil.isBlank(userId)){
return new ArrayList<>(); return new ArrayList<>();
} }
return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,keyword); return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,deskRequest);
} }
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 设计表关联查询 //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 设计表关联查询
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,String keyword) { public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,DeskRequest deskRequest) {
if (StringUtil.isBlank(userId)){ if (StringUtil.isBlank(userId)){
return new ArrayList<>(); 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.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.OperationLogMapper; import com.cool.store.mapper.OperationLogMapper;
import com.cool.store.request.DeskRequest;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@@ -63,11 +64,11 @@ public class OperationLogDAO {
return operationLogMapper.getBySubStageStatusEnumAndsStatus(shopId,shopSubStageStatusEnum.getShopSubStageStatus(),type); 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)) { if ( CollectionUtils.isEmpty(shopSubStageStatus)) {
return null; 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) { public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) { 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.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.mapper.ShopStageInfoMapper; import com.cool.store.mapper.ShopStageInfoMapper;
import com.cool.store.request.DeskRequest;
import com.cool.store.vo.Preparation.PreparationProcessVO; import com.cool.store.vo.Preparation.PreparationProcessVO;
import com.cool.store.vo.shop.RentInfoToDoVO; import com.cool.store.vo.shop.RentInfoToDoVO;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
@@ -337,8 +338,8 @@ public class ShopStageInfoDAO {
public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage, public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList, List<Integer> shopSubStageStatusList,
String investmentUserId, String investmentUserId,
List<String> authRegionIds,Boolean ownShopFlag,String keyword) { List<String> authRegionIds,Boolean ownShopFlag, DeskRequest deskRequest) {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, keyword); 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; package com.cool.store.mapper;
import com.cool.store.entity.DecorationDesignInfoDO; import com.cool.store.entity.DecorationDesignInfoDO;
import com.cool.store.request.DeskRequest;
import com.cool.store.vo.desk.PreparationCommonPendingVO; import com.cool.store.vo.desk.PreparationCommonPendingVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
@@ -17,7 +18,7 @@ public interface DecorationDesignInfoMapper extends Mapper<DecorationDesignInfoD
*/ */
DecorationDesignInfoDO selectByShopId(Long shopId); 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 * @Auther: wangshuo
* @Date: 2025/6/16 * @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; package com.cool.store.mapper;
import com.cool.store.entity.DecorationMeasureDO; import com.cool.store.entity.DecorationMeasureDO;
import com.cool.store.request.DeskRequest;
import com.cool.store.vo.desk.PreparationCommonPendingVO; import com.cool.store.vo.desk.PreparationCommonPendingVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
@@ -17,9 +18,9 @@ public interface DecorationMeasureMapper extends Mapper<DecorationMeasureDO> {
*/ */
DecorationMeasureDO selectByShopId(Long shopId); 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.dto.OperationLogDTO;
import com.cool.store.entity.OperationLogDO; import com.cool.store.entity.OperationLogDO;
import com.cool.store.request.DeskRequest;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
@@ -24,7 +25,7 @@ public interface OperationLogMapper extends Mapper<OperationLogDO> {
Long batchAddOperationLog(@Param("list") List<OperationLogDO> 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("request") DeskRequest deskRequest);
OperationLogDO getByCondition(@Param("shopId") Long shopId,@Param("shopSubStageStatus") Integer shopSubStageStatus); 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.entity.ShopStageInfoDO;
import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum; 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.Preparation.PreparationProcessVO;
import com.cool.store.vo.shop.RentInfoToDoVO; import com.cool.store.vo.shop.RentInfoToDoVO;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
@@ -149,7 +150,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("investmentUserId") String investmentUserId, @Param("investmentUserId") String investmentUserId,
@Param("authRegionIds") List<String> authRegionIds, @Param("authRegionIds") List<String> authRegionIds,
@Param("ownShopFlag") Boolean ownShopFlag, @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> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage); List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);

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

@@ -63,12 +63,49 @@
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
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
where a.design_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
and c.shop_status !=2 and c.shop_status !=2
<if test="keyword !=null and keyword !=''"> <if test="request.stageStatus !=null and request.stageStatus.size() >0">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) and b.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (c.shop_name like concat('%',#{request.shopKeyword},'%') or c.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and c.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 c.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 c.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and c.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if> </if>
order by b.update_time desc order by b.update_time desc
</select> </select>

123
coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml
View File

@@ -48,12 +48,49 @@
from xfsg_decoration_measure a from xfsg_decoration_measure 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
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
where a.measure_user_id = #{measureUserId} where a.measure_user_id = #{measureUserId}
and b.shop_sub_stage_status = 892 and b.shop_sub_stage_status = 892
and c.deleted = 0 and c.deleted = 0
and c.shop_status !=2 and c.shop_status !=2
<if test="keyword != null and keyword != ''"> <if test="request.stageStatus !=null and request.stageStatus.size() >0">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) and b.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (c.shop_name like concat('%',#{request.shopKeyword},'%') or c.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and c.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 c.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 c.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and c.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if> </if>
order by b.update_time desc order by b.update_time desc
</select> </select>
@@ -76,12 +113,49 @@
from xfsg_decoration_measure a from xfsg_decoration_measure 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
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
where a.design_user_id = #{userId} where a.design_user_id = #{userId}
and b.shop_sub_stage_status = 900 and b.shop_sub_stage_status = 900
and c.deleted = 0 and c.deleted = 0
and c.shop_status !=2 and c.shop_status !=2
<if test="keyword != null and keyword != ''"> <if test="request.stageStatus !=null and request.stageStatus.size() >0">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) and b.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (c.shop_name like concat('%',#{request.shopKeyword},'%') or c.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and c.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 c.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 c.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and c.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if> </if>
order by b.update_time desc order by b.update_time desc
</select> </select>
@@ -105,11 +179,48 @@
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
left join xfsg_decoration_design_info d on a.shop_id = d.shop_id left join xfsg_decoration_design_info d on a.shop_id = d.shop_id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
where where
((b.shop_sub_stage_status = 900 and a.design_user_id = #{userId}) or (b.shop_sub_stage_status = 901 and d.design_user_id = #{userId})) ((b.shop_sub_stage_status = 900 and a.design_user_id = #{userId}) or (b.shop_sub_stage_status = 901 and d.design_user_id = #{userId}))
and c.deleted = 0 and c.shop_status !=2 and c.deleted = 0 and c.shop_status !=2
<if test="keyword !=null and keyword !=''"> <if test="request.stageStatus !=null and request.stageStatus.size() >0">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%')) and b.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (c.shop_name like concat('%',#{request.shopKeyword},'%') or c.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and c.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 c.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 c.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and c.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if> </if>
order by b.update_time desc order by b.update_time desc

2
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -483,7 +483,7 @@
<if test="wantShopAreaName != null"> <if test="wantShopAreaName != null">
left join xfsg_open_area_info b on a.want_shop_area_id = b.id left join xfsg_open_area_info b on a.want_shop_area_id = b.id
</if> </if>
where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) and ( c.deleted = 0 or c.deleted is null) where a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2)
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
and (a.investment_manager = #{userId} or c.investment_manager = #{userId} ) and (a.investment_manager = #{userId} or c.investment_manager = #{userId} )
</if> </if>

41
coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml
View File

@@ -81,6 +81,9 @@
select * select *
from xfsg_operation_log a from xfsg_operation_log a
left join xfsg_shop_info b on a.shop_id = b.id left join xfsg_shop_info b on a.shop_id = b.id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
where where
b.deleted=0 b.deleted=0
and b.shop_status !=2 and b.shop_status !=2
@@ -90,8 +93,42 @@
#{item} #{item}
</foreach> </foreach>
and a.status = 0 and a.status = 0
<if test="keyword !=null and keyword !=''"> <if test="request.stageStatus !=null and request.stageStatus.size() >0">
and (b.shop_code like concat('%',#{keyword},'%') or b.shop_name like concat('%',#{keyword},'%')) and a.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (b.shop_name like concat('%',#{request.shopKeyword},'%') or b.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and b.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 b.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 b.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and b.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if> </if>
order by a.create_time desc order by a.create_time desc
</select> </select>

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

@@ -304,6 +304,9 @@
* *
from xfsg_shop_stage_info a from xfsg_shop_stage_info a
left join xfsg_shop_info si on a.shop_id = si.id 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_franchise sign on a.shop_id = sign.shop_id
</if>
<where> <where>
si.deleted = 0 and a.is_terminated = 0 and si.shop_status !=2 si.deleted = 0 and a.is_terminated = 0 and si.shop_status !=2
<if test="shopIds != null and shopIds.size() > 0"> <if test="shopIds != null and shopIds.size() > 0">
@@ -322,6 +325,13 @@
#{stageStatus} #{stageStatus}
</foreach> </foreach>
</if> </if>
<if test="request.stageStatus !=null and request.stageStatus.size() >0">
and a.shop_sub_stage_status in
<foreach collection="request.stageStatus" item="item" index="index" open="(" separator=","
close=")">
#{item}
</foreach>
</if>
<if test="investmentUserId!=null and investmentUserId!='' and authRegionIds.size()==0"> <if test="investmentUserId!=null and investmentUserId!='' and authRegionIds.size()==0">
and si.investment_manager = #{investmentUserId} and si.investment_manager = #{investmentUserId}
</if> </if>
@@ -339,8 +349,35 @@
and si.join_mode != 3 and si.join_mode != 3
</if> </if>
</if> </if>
<if test="keyword!=null and keyword !=''"> <if test="request.shopKeyword !=null and request.shopKeyword !=''">
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},'%'))
</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> </if>
order by a.update_time desc order by a.update_time desc
</where> </where>

41
coolstore-partner-model/src/main/java/com/cool/store/request/DeskRequest.java Normal file
View File

@@ -0,0 +1,41 @@
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<Long> regionIds;
@ApiModelProperty(value = "开发督导")
private String supervisorId;
@ApiModelProperty(value = "门店类型")
private List<Integer> storeTypes;
@ApiModelProperty(value = "加盟模式")
private List<Integer> joinModes;
@ApiModelProperty(value = "签约类型")
private List<Integer> signTypes;
@ApiModelProperty(value = "阶段状态")
private List<Integer> stageStatus;
private Integer pageNum = 1;
private Integer pageSize = 10;
}

72
coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
View File

@@ -6,6 +6,7 @@ import com.cool.store.dto.PendingCountDTO;
import com.cool.store.entity.HyPartnerLabelDO; import com.cool.store.entity.HyPartnerLabelDO;
import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.LineInfoDO;
import com.cool.store.request.BusinessRemarkRequest; import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.request.DeskRequest;
import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.BaseInfoVO;
import com.cool.store.vo.desk.*; import com.cool.store.vo.desk.*;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@@ -23,8 +24,7 @@ public interface DeskService {
/** /**
* 加盟申请待处理 * 加盟申请待处理
* @param pageNum
* @param pageSize
* @param userId * @param userId
* @return * @return
*/ */
@@ -33,8 +33,7 @@ public interface DeskService {
/** /**
* payStagePendingList * payStagePendingList
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
@@ -43,8 +42,7 @@ public interface DeskService {
/** /**
* signingPendingList * signingPendingList
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
@@ -79,127 +77,121 @@ public interface DeskService {
/** /**
* 缴纳加盟费待处理数据 * 缴纳加盟费待处理数据
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 加盟合同签约待处理数据 * 加盟合同签约待处理数据
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 发票回传待处理数据 * 发票回传待处理数据
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 开业运营方案待处理数据 * 开业运营方案待处理数据
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 培训清单待处理数据 * 培训清单待处理数据
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> trainListPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 信发系统 * 信发系统
*/ */
PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> xinFaListPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* pos * pos
*/ */
PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> posListPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 营帐通 * 营帐通
*/ */
PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> tentPassListPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* orderSys * orderSys
*/ */
PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> orderSysPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 设计阶段 * 设计阶段
*/ */
PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> designPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 施工阶段 * 施工阶段
*/ */
PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> constructionPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 装修验收阶段 * 装修验收阶段
*/ */
PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> fitmentPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 抖音阶段 * 抖音阶段
*/ */
PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> DYPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 快手 * 快手
*/ */
PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> KSPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 美团外卖 * 美团外卖
*/ */
PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> MTPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 美团团购 * 美团团购
*/ */
PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> MTBuyPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 饿了么 * 饿了么
*/ */
PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> ELMEPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 建店资料 * 建店资料
*/ */
PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> buildInformationPendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 测量阶段 * 测量阶段
* @param pageNum
* @param pageSize
* @param user * @param user
* @return * @return
*/ */
PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> measurePendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 营业执照 * 营业执照
*/ */
PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> businessLicensePendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 食品安全许可证 * 食品安全许可证
*/ */
PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> foodLicensePendingList(DeskRequest deskRequest, LoginUserInfo user );
/** /**
* 京东外卖 * 京东外卖
*/ */
PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword); PageInfo<PreparationCommonPendingVO> JingDongPendingList(DeskRequest deskRequest, LoginUserInfo user );
Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user); Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user);

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

@@ -19,11 +19,11 @@ import com.cool.store.mapper.EnterpriseUserRoleMapper;
import com.cool.store.mapper.IntentAgreementMapper; import com.cool.store.mapper.IntentAgreementMapper;
import com.cool.store.mapper.TrainingExperienceMapper; import com.cool.store.mapper.TrainingExperienceMapper;
import com.cool.store.request.BusinessRemarkRequest; import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.request.DeskRequest;
import com.cool.store.service.DeskService; import com.cool.store.service.DeskService;
import com.cool.store.service.RegionService; import com.cool.store.service.RegionService;
import com.cool.store.service.SysRoleService; import com.cool.store.service.SysRoleService;
import com.cool.store.service.UserAuthMappingService; import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.CoolDateUtils;
import com.cool.store.utils.StringUtil; import com.cool.store.utils.StringUtil;
import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.DateUtils;
import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.BaseInfoVO;
@@ -100,9 +100,9 @@ public class DeskServiceImpl implements DeskService {
private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO; private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO;
@Override @Override
public PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize, String userId,String keyword) { public PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize, String userId, String keyword) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(INTENT_5.getCode()),keyword); List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(INTENT_5.getCode()), keyword);
PageInfo page = new PageInfo(lineInfoDOS); PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS); Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -127,9 +127,9 @@ public class DeskServiceImpl implements DeskService {
@Override @Override
public PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user, String keyword) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()),keyword); List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()), keyword);
PageInfo page = new PageInfo(lineInfoDOS); PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS); Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -156,10 +156,10 @@ public class DeskServiceImpl implements DeskService {
} }
@Override @Override
public PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user, String keyword) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(),
Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()),keyword); Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()), keyword);
PageInfo page = new PageInfo(lineInfoDOS); PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS); Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -255,25 +255,26 @@ public class DeskServiceImpl implements DeskService {
@Override @Override
public PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(DeskRequest deskRequest, LoginUserInfo user) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
PageInfo<PreparationCommonPendingVO> pageInfo = new PageInfo<>(); PageInfo<PreparationCommonPendingVO> pageInfo = new PageInfo<>();
List<Integer> subStageStatusList = new ArrayList<>(); List<Integer> subStageStatusList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(userRoleIds)) { if (CollectionUtils.isNotEmpty(userRoleIds)) {
//督导代填 //督导代填
if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_7,
Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE,keyword); Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE);
} else { } else {
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) || isAdmin) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
} }
if(userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())||userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())){ if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) || isAdmin) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus());
} }
if (!subStageStatusList.isEmpty()) { if (!subStageStatusList.isEmpty()) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_7,
subStageStatusList, Boolean.TRUE,keyword); subStageStatusList, Boolean.TRUE);
} }
} }
} }
@@ -281,63 +282,73 @@ public class DeskServiceImpl implements DeskService {
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(DeskRequest deskRequest, LoginUserInfo user) {
PageInfo<PreparationCommonPendingVO> pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_8, List<Integer> subStageStatusList = new ArrayList<>();
Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE,keyword); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) || isAdmin) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus());
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus());
}
if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode()) || isAdmin) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus());
}
PageInfo<PreparationCommonPendingVO> pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_8,
subStageStatusList, Boolean.TRUE);
return pageInfo; return pageInfo;
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8_5, return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_8_5,
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE,keyword); Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE,keyword); return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> trainListPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_5, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_5,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE,keyword); Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23, return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_23,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> posListPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16, return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_16,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> tentPassListPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24, return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_24,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> orderSysPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17, return commonPendingVOPageInfo(deskRequest, null, ShopSubStageEnum.SHOP_STAGE_17,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> designPendingList(DeskRequest deskRequest, LoginUserInfo user) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
List<Integer> subStageStatusList = new ArrayList<>(); List<Integer> subStageStatusList = new ArrayList<>();
//报价员和管理员不指定人，看阶段符合的全部数据 //报价员和管理员不指定人，看阶段符合的全部数据
@@ -351,10 +362,10 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.getShopSubStageStatus());
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_903.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 { } else {
List<PreparationCommonPendingVO> list = new ArrayList<>(); List<PreparationCommonPendingVO> list = new ArrayList<>();
list = getDesignPendingVO(pageNum, pageSize, user, userRoleIds,keyword); list = getDesignPendingVO(deskRequest, user, userRoleIds);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return new PageInfo<>(); return new PageInfo<>();
@@ -389,46 +400,46 @@ public class DeskServiceImpl implements DeskService {
} }
} }
private List<PreparationCommonPendingVO> getDesignPendingVO(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Long> userRoleIds,String keyword) { private List<PreparationCommonPendingVO> getDesignPendingVO(DeskRequest deskRequest, LoginUserInfo user, List<Long> userRoleIds) {
//只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师 //只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(deskRequest.getPageNum(), deskRequest.getPageSize());
List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(), keyword); List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(), deskRequest);
List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus())); List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){ for (PreparationCommonPendingVO preparationCommonPendingVO : resultList) {
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>()); List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark)); Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), "")); preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
} }
return resultList; return resultList;
} }
//只有设计师 查询 指定当前用户和阶段为 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(deskRequest.getPageNum(), deskRequest.getPageSize());
List<PreparationCommonPendingVO> resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(),keyword); List<PreparationCommonPendingVO> resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(), deskRequest);
List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus())); List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){ for (PreparationCommonPendingVO preparationCommonPendingVO : resultList) {
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>()); List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark)); Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), "")); preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
} }
return resultList; return resultList;
} }
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 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())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(deskRequest);
List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId(),keyword); List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId(), deskRequest);
List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List<Long> shopIds = resultList.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus())); List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId)); Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){ for (PreparationCommonPendingVO preparationCommonPendingVO : resultList) {
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>()); List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark)); Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), "")); preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
} }
return resultList; return resultList;
} }
@@ -436,66 +447,66 @@ public class DeskServiceImpl implements DeskService {
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> constructionPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_11,
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(), 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 @Override
public PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> fitmentPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_12,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> DYPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()));
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> KSPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()));
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> MTPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()));
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> MTBuyPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()));
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> ELMEPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()));
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> buildInformationPendingList(DeskRequest deskRequest, LoginUserInfo user) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_15,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE,keyword ); Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE);
} }
//如果不是财务角色或者即是财务又是自有店财务 则不需要标识 //如果不是财务角色或者即是财务又是自有店财务 则不需要标识
Boolean ownShopFlag = null; Boolean ownShopFlag = null;
if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())&&userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())){ if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode()) && userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())) {
ownShopFlag = null; ownShopFlag = null;
}else if(userRoleIds.contains(UserRoleEnum.FINANCE.getCode())){ } else if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())) {
ownShopFlag = Boolean.FALSE; ownShopFlag = Boolean.FALSE;
}else if (userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())){ } else if (userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())) {
ownShopFlag = Boolean.TRUE; ownShopFlag = Boolean.TRUE;
} }
List<Integer> subStageStatusList = new ArrayList<>(); List<Integer> subStageStatusList = new ArrayList<>();
if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) { if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus());
} }
if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())||userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())) { if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode()) || userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())) {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus());
} }
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) {
@@ -515,11 +526,11 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus());
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.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 @Override
public PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> measurePendingList(DeskRequest deskRequest, LoginUserInfo user) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
List<Integer> subStageStatusList = new ArrayList<>(); List<Integer> subStageStatusList = new ArrayList<>();
Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
@@ -529,12 +540,12 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus());
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862.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())) { if (userRoleIds.contains(UserRoleEnum.MEASURE_OFFICE.getCode())) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(deskRequest);
List<PreparationCommonPendingVO> list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId(),keyword); List<PreparationCommonPendingVO> list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId(), deskRequest);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return new PageInfo<>(); return new PageInfo<>();
} }
@@ -571,45 +582,46 @@ public class DeskServiceImpl implements DeskService {
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> businessLicensePendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_3, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_3,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE ,keyword); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> foodLicensePendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_4, return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_4,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE,keyword ); Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE);
} }
@Override @Override
public PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) { public PageInfo<PreparationCommonPendingVO> JingDongPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()),keyword); return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()));
} }
@Override @Override
public Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user){ public Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user) {
if (!((request.getShopId() != null&&request.getSubStage()!=null&&request.getSubStageStatus()!=null) if (!((request.getShopId() != null && request.getSubStage() != null && request.getSubStageStatus() != null)
||(request.getLineId()!=null&&request.getWorkflowSubStage()!=null&&request.getWorkflowSubStageStatus()!=null))){ || (request.getLineId() != null && request.getWorkflowSubStage() != null && request.getWorkflowSubStageStatus() != null))) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
ShopStageRemarkInfoDO remarkInfoDO = new ShopStageRemarkInfoDO(); ShopStageRemarkInfoDO remarkInfoDO = new ShopStageRemarkInfoDO();
if (request.getShopId() != null){ if (request.getShopId() != null) {
remarkInfoDO = shopStageRemarkInfoDAO.getByShopIdAndStage(request.getShopId(),request.getSubStageStatus()); remarkInfoDO = shopStageRemarkInfoDAO.getByShopIdAndStage(request.getShopId(), request.getSubStageStatus());
remarkInfoDO.setShopId(request.getShopId()); remarkInfoDO.setShopId(request.getShopId());
remarkInfoDO.setShopSubStage(request.getSubStage()); remarkInfoDO.setShopSubStage(request.getSubStage());
remarkInfoDO.setShopSubStageStatus(request.getSubStageStatus()); remarkInfoDO.setShopSubStageStatus(request.getSubStageStatus());
}else if (request.getLineId() != null){ } else if (request.getLineId() != null) {
remarkInfoDO = shopStageRemarkInfoDAO.getByLineIdAndStage(request.getLineId(),request.getWorkflowSubStageStatus()); remarkInfoDO = shopStageRemarkInfoDAO.getByLineIdAndStage(request.getLineId(), request.getWorkflowSubStageStatus());
remarkInfoDO.setLineId(request.getLineId()); remarkInfoDO.setLineId(request.getLineId());
remarkInfoDO.setWorkflowSubStage(request.getWorkflowSubStage()); remarkInfoDO.setWorkflowSubStage(request.getWorkflowSubStage());
remarkInfoDO.setWorkflowSubStageStatus(request.getWorkflowSubStageStatus()); remarkInfoDO.setWorkflowSubStageStatus(request.getWorkflowSubStageStatus());
} }
remarkInfoDO.setRemark(request.getBusinessRemark()); remarkInfoDO.setRemark(request.getBusinessRemark());
if(remarkInfoDO.getCreateTime()==null){ if (remarkInfoDO.getCreateTime() == null) {
remarkInfoDO.setCreateTime(new Date()); remarkInfoDO.setCreateTime(new Date());
} }
if (StringUtil.isBlank(remarkInfoDO.getCreateUserId())){ if (StringUtil.isBlank(remarkInfoDO.getCreateUserId())) {
remarkInfoDO.setCreateUserId(user.getUserId()); remarkInfoDO.setCreateUserId(user.getUserId());
} }
remarkInfoDO.setUpdateTime(new Date()); remarkInfoDO.setUpdateTime(new Date());
@@ -618,31 +630,28 @@ public class DeskServiceImpl implements DeskService {
} }
/** /**
* 通用查询 * 通用查询
* @param pageNum
* @param pageSize
* @param user * @param user
* @param shopSubStageEnum * @param shopSubStageEnum
* @param subStageStatusList * @param subStageStatusList
* @param filterFlag * @param filterFlag
* @return * @return
*/ */
private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag,String keyword){ private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(DeskRequest deskRequest, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag) {
return this.commonPendingVOPage(pageNum,pageSize,user,shopSubStageEnum,subStageStatusList,filterFlag,null,keyword); return this.commonPendingVOPage(deskRequest, user, shopSubStageEnum, subStageStatusList, filterFlag, null);
} }
/** /**
* 通用查询 * 通用查询
* *
* @param pageNum
* @param pageSize
* @param user * @param user
* @param shopSubStageEnum * @param shopSubStageEnum
* @param subStageStatusList * @param subStageStatusList
* @return * @return
*/ */
private PageInfo<PreparationCommonPendingVO> commonPendingVOPage(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag,Boolean ownShopFlag,String keyword) { private PageInfo<PreparationCommonPendingVO> commonPendingVOPage(DeskRequest deskRequest, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag, Boolean ownShopFlag) {
//user.getJobNumber() //user.getJobNumber()
List<String> authRegionIds = new ArrayList<>(); List<String> authRegionIds = new ArrayList<>();
if (filterFlag) { if (filterFlag) {
@@ -650,9 +659,9 @@ public class DeskServiceImpl implements DeskService {
authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
} }
} }
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(deskRequest.getPageNum(), deskRequest.getPageSize());
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), List<ShopStageInfoDO> 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); PageInfo result = new PageInfo<>(specialShopStageInfo);
List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());
@@ -684,7 +693,7 @@ public class DeskServiceImpl implements DeskService {
specialShopStageInfo.forEach(x -> { specialShopStageInfo.forEach(x -> {
PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO(); PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO();
List<ShopStageRemarkInfoDO> remarkInfoMapOrDefault = remarkInfoMap.getOrDefault(x.getShopId(), new ArrayList<>()); List<ShopStageRemarkInfoDO> remarkInfoMapOrDefault = remarkInfoMap.getOrDefault(x.getShopId(), new ArrayList<>());
Map<Integer, ShopStageRemarkInfoDO> remarkInfoMapByStageStatus = remarkInfoMapOrDefault.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, Function.identity())); Map<Integer, ShopStageRemarkInfoDO> remarkInfoMapByStageStatus = remarkInfoMapOrDefault.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, Function.identity()));
preparationCommonPendingVO.setBusinessRemark(remarkInfoMapByStageStatus.getOrDefault(x.getShopSubStageStatus(), new ShopStageRemarkInfoDO()).getRemark()); preparationCommonPendingVO.setBusinessRemark(remarkInfoMapByStageStatus.getOrDefault(x.getShopSubStageStatus(), new ShopStageRemarkInfoDO()).getRemark());
preparationCommonPendingVO.setLineId(x.getLineId()); preparationCommonPendingVO.setLineId(x.getLineId());
preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setShopId(x.getShopId());
@@ -743,9 +752,9 @@ public class DeskServiceImpl implements DeskService {
} }
//平台建店通用查询 //平台建店通用查询
private PageInfo<PreparationCommonPendingVO> commonPlatformBuild(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Integer> subStageStatusList,String keyword) { private PageInfo<PreparationCommonPendingVO> commonPlatformBuild(DeskRequest deskRequest, LoginUserInfo user, List<Integer> subStageStatusList) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(deskRequest);
List<OperationLogDO> operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList,keyword); List<OperationLogDO> operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList, deskRequest);
if (CollectionUtils.isEmpty(operationLogDOList)) { if (CollectionUtils.isEmpty(operationLogDOList)) {
return new PageInfo<>(); return new PageInfo<>();
} }

156
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
View File

@@ -5,6 +5,7 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.InvestmentCountDTO; import com.cool.store.dto.InvestmentCountDTO;
import com.cool.store.dto.PendingCountDTO; import com.cool.store.dto.PendingCountDTO;
import com.cool.store.request.BusinessRemarkRequest; import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.request.DeskRequest;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.DeskService; import com.cool.store.service.DeskService;
import com.cool.store.vo.desk.*; import com.cool.store.vo.desk.*;
@@ -74,179 +75,156 @@ public class DeskController {
} }
@ApiOperation("待处理-支付加盟费保证金") @ApiOperation("待处理-支付加盟费保证金")
@GetMapping("/payFranchiseFeesPendingList") @PostMapping("/payFranchiseFeesPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize ,
@RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.payFranchiseFeesPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-签约加盟合同") @ApiOperation("待处理-签约加盟合同")
@GetMapping("/signingOfFranchiseContractPendingList") @PostMapping("/signingOfFranchiseContractPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> signingOfFranchiseContractPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> signingOfFranchiseContractPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.signingOfFranchiseContractPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.signingOfFranchiseContractPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-发票回传") @ApiOperation("待处理-发票回传")
@GetMapping("/invoiceReturnPendingList") @PostMapping("/invoiceReturnPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> invoiceReturnPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> invoiceReturnPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.invoiceReturnPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.invoiceReturnPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-开店运营方案") @ApiOperation("待处理-开店运营方案")
@GetMapping("/openingAndOperationPlanPendingList") @PostMapping("/openingAndOperationPlanPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingAndOperationPlanPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingAndOperationPlanPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.openingAndOperationPlanPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-培训登记") @ApiOperation("待处理-培训登记")
@GetMapping("/trainListPendingList") @PostMapping("/trainListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.trainListPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.trainListPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-信发系统") @ApiOperation("待处理-信发系统")
@GetMapping("/xinFaListPendingList") @PostMapping("/xinFaListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.xinFaListPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.xinFaListPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-pos") @ApiOperation("待处理-pos")
@GetMapping("/posListPendingList") @PostMapping("/posListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.posListPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.posListPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-营帐通") @ApiOperation("待处理-营帐通")
@GetMapping("/tentPassListPendingList") @PostMapping("/tentPassListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> tentPassListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> tentPassListPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.tentPassListPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.tentPassListPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-订货系统") @ApiOperation("待处理-订货系统")
@GetMapping("/orderSysPendingList") @PostMapping("/orderSysPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> orderSysPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> orderSysPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.orderSysPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.orderSysPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-设计阶段") @ApiOperation("待处理-设计阶段")
@GetMapping("/designPendingList") @PostMapping("/designPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> designPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> designPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.designPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.designPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-施工阶段") @ApiOperation("待处理-施工阶段")
@GetMapping("/constructionPendingList") @PostMapping("/constructionPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> constructionPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> constructionPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.constructionPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.constructionPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-装修验收阶段") @ApiOperation("待处理-装修验收阶段")
@GetMapping("/fitmentPendingList") @PostMapping("/fitmentPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> fitmentPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> fitmentPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.fitmentPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.fitmentPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-抖音阶段") @ApiOperation("待处理-抖音阶段")
@GetMapping("/DYPendingList") @PostMapping("/DYPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> DYPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> DYPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.DYPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.DYPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-快手") @ApiOperation("待处理-快手")
@GetMapping("/KSPendingList") @PostMapping("/KSPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> KSPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> KSPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.KSPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.KSPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-美团外卖") @ApiOperation("待处理-美团外卖")
@GetMapping("/MTPendingList") @PostMapping("/MTPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.MTPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.MTPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-美团团购") @ApiOperation("待处理-美团团购")
@GetMapping("/MTBuyPendingList") @PostMapping("/MTBuyPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTButPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTButPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.MTBuyPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.MTBuyPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-饿了么") @ApiOperation("待处理-饿了么")
@GetMapping("/ELMEPendingList") @PostMapping("/ELMEPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> ELMEPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> ELMEPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.ELMEPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.ELMEPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-建店资料") @ApiOperation("待处理-建店资料")
@GetMapping("/buildInformationPendingList") @PostMapping("/buildInformationPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> buildInformationPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> buildInformationPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.buildInformationPendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.buildInformationPendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-测量阶段") @ApiOperation("待处理-测量阶段")
@GetMapping("/measurePendingList") @PostMapping("/measurePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.measurePendingList(pageNumber, pageSize, userInfo,keyword)); return ResponseResult.success(deskService.measurePendingList( deskRequest, userInfo ));
} }
@ApiOperation("待处理-营业执照") @ApiOperation("待处理-营业执照")
@GetMapping("/businessLicensePendingList") @PostMapping("/businessLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> businessLicensePendingList(@RequestBody DeskRequest deskRequest){
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword){
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo,keyword)); return ResponseResult.success(deskService.businessLicensePendingList(deskRequest,userInfo ));
} }
@ApiOperation("待处理-食品许可证") @ApiOperation("待处理-食品许可证")
@GetMapping("/foodLicensePendingList") @PostMapping("/foodLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> foodLicensePendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo,keyword)); return ResponseResult.success(deskService.foodLicensePendingList(deskRequest,userInfo ));
} }
@ApiOperation("待处理-京东外卖") @ApiOperation("待处理-京东外卖")
@GetMapping("/JingDongPendingList") @PostMapping("/JingDongPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> JingDongPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, public ResponseResult<PageInfo<PreparationCommonPendingVO>> JingDongPendingList(@RequestBody DeskRequest deskRequest) {
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser(); LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.JingDongPendingList(pageNumber,pageSize,userInfo,keyword)); return ResponseResult.success(deskService.JingDongPendingList(deskRequest,userInfo ));
} }
@ApiOperation("提交业务备注") @ApiOperation("提交业务备注")
@PostMapping("/submitBusinessRemark") @PostMapping("/submitBusinessRemark")