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

待办优化需求

Browse Source
This commit is contained in:
shuo.wang
2025-06-26 13:51:24 +08:00
parent 9d73c7ae9b
commit c232175aa5
8 changed files with 301 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,12 +63,49 @@
from xfsg_decoration_design_info a
left join xfsg_shop_stage_info b on a.shop_id = b.shop_id
left join xfsg_shop_info c on a.shop_id = c.id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_shop_sign_info sign on a.shop_id = sign.shop_id
</if>
where a.design_user_id = #{userId}
and b.shop_sub_stage_status = 901
and c.deleted = 0
and c.shop_status !=2
<if test="keyword !=null and keyword !=''">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%'))
<if test="request.stageStatus !=null and request.stageStatus.size() >0">
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>
order by b.update_time desc
</select>

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

@@ -48,12 +48,49 @@
from xfsg_decoration_measure a
left join xfsg_shop_stage_info b on a.shop_id = b.shop_id
left join xfsg_shop_info c on a.shop_id = c.id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_shop_sign_info sign on a.shop_id = sign.shop_id
</if>
where a.measure_user_id = #{measureUserId}
and b.shop_sub_stage_status = 892
and c.deleted = 0
and c.shop_status !=2
<if test="keyword != null and keyword != ''">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%'))
<if test="request.stageStatus !=null and request.stageStatus.size() >0">
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>
order by b.update_time desc
</select>
@@ -76,12 +113,49 @@
from xfsg_decoration_measure a
left join xfsg_shop_stage_info b on a.shop_id = b.shop_id
left join xfsg_shop_info c on a.shop_id = c.id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_shop_sign_info sign on a.shop_id = sign.shop_id
</if>
where a.design_user_id = #{userId}
and b.shop_sub_stage_status = 900
and c.deleted = 0
and c.shop_status !=2
<if test="keyword != null and keyword != ''">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%'))
<if test="request.stageStatus !=null and request.stageStatus.size() >0">
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>
order by b.update_time desc
</select>
@@ -105,11 +179,48 @@
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_decoration_design_info d on a.shop_id = d.shop_id
<if test="request.signTypes !=null and request.signTypes.size()>0">
left join xfsg_shop_sign_info sign on a.shop_id = sign.shop_id
</if>
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}))
and c.deleted = 0 and c.shop_status !=2
<if test="keyword !=null and keyword !=''">
and (c.shop_name like concat('%',#{keyword},'%') or c.shop_code like concat('%',#{keyword},'%'))
<if test="request.stageStatus !=null and request.stageStatus.size() >0">
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>
order by b.update_time desc

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

@@ -81,6 +81,9 @@
select *
from xfsg_operation_log a
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_shop_sign_info sign on a.shop_id = sign.shop_id
</if>
where
b.deleted=0
and b.shop_status !=2
@@ -90,8 +93,42 @@
#{item}
</foreach>
and a.status = 0
<if test="keyword !=null and keyword !=''">
and (b.shop_code like concat('%',#{keyword},'%') or b.shop_name like concat('%',#{keyword},'%'))
<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="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>
order by a.create_time desc
</select>

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

@@ -325,6 +325,13 @@
#{stageStatus}
</foreach>
</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">
and si.investment_manager = #{investmentUserId}
</if>

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

@@ -32,6 +32,8 @@ public class DeskRequest {
@ApiModelProperty(value = "签约类型")
private List<Integer> signTypes;
@ApiModelProperty(value = "阶段状态")
private List<Integer> stageStatus;
private Integer pageNum = 1;

22
coolstore-partner-model/src/main/java/com/cool/store/response/DeskStageResponse.java
View File

@@ -1,22 +0,0 @@
package com.cool.store.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/06/23/16:33
* @Version 1.0
* @注释:
*/
@Data
public class DeskStageResponse {
@ApiModelProperty(value = "阶段")
private Integer shopSubStage;
@ApiModelProperty(value = "阶段状态")
private Integer shopSubStageStatus;
@ApiModelProperty(value = "阶段状态描述")
private String shopSubStageStatusDesc;
}

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

@@ -7,7 +7,6 @@ import com.cool.store.entity.HyPartnerLabelDO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.request.DeskRequest;
import com.cool.store.response.DeskStageResponse;
import com.cool.store.vo.BaseInfoVO;
import com.cool.store.vo.desk.*;
import com.github.pagehelper.PageInfo;
@@ -196,5 +195,4 @@ public interface DeskService {
Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user);
List<DeskStageResponse> getDeskStageList(Integer shopSubStage,String userId);
}

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

@@ -20,12 +20,10 @@ import com.cool.store.mapper.IntentAgreementMapper;
import com.cool.store.mapper.TrainingExperienceMapper;
import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.request.DeskRequest;
import com.cool.store.response.DeskStageResponse;
import com.cool.store.service.DeskService;
import com.cool.store.service.RegionService;
import com.cool.store.service.SysRoleService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.CoolDateUtils;
import com.cool.store.utils.StringUtil;
import com.cool.store.utils.poi.DateUtils;
import com.cool.store.vo.BaseInfoVO;
@@ -267,10 +265,11 @@ public class DeskServiceImpl implements DeskService {
pageInfo = commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_7,
Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()), Boolean.FALSE);
} 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());
}
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());
}
if (!subStageStatusList.isEmpty()) {
@@ -284,8 +283,18 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(DeskRequest deskRequest, LoginUserInfo user) {
List<Integer> subStageStatusList = new ArrayList<>();
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,
Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE);
subStageStatusList, Boolean.TRUE);
return pageInfo;
}
@@ -394,7 +403,7 @@ public class DeskServiceImpl implements DeskService {
private List<PreparationCommonPendingVO> getDesignPendingVO(DeskRequest deskRequest, LoginUserInfo user, List<Long> userRoleIds) {
//只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) {
PageHelper.startPage(deskRequest);
PageHelper.startPage(deskRequest.getPageNum(), deskRequest.getPageSize());
List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(), deskRequest);
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()));
@@ -408,7 +417,7 @@ public class DeskServiceImpl implements DeskService {
}
//只有设计师 查询 指定当前用户和阶段为 901
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
PageHelper.startPage(deskRequest);
PageHelper.startPage(deskRequest.getPageNum(), deskRequest.getPageSize());
List<PreparationCommonPendingVO> resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(), deskRequest);
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()));
@@ -583,6 +592,7 @@ public class DeskServiceImpl implements DeskService {
return commonPendingVOPageInfo(deskRequest, user, ShopSubStageEnum.SHOP_STAGE_4,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE);
}
@Override
public PageInfo<PreparationCommonPendingVO> JingDongPendingList(DeskRequest deskRequest, LoginUserInfo user) {
return commonPlatformBuild(deskRequest, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()));
@@ -619,25 +629,10 @@ public class DeskServiceImpl implements DeskService {
return shopStageRemarkInfoDAO.insertOrUpdate(remarkInfoDO);
}
@Override
public List<DeskStageResponse> getDeskStageList(Integer shopSubStage, String userId) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId);
if (CollectionUtils.isEmpty(userRoleIds)){
return new ArrayList<>();
}
List<DeskStageResponse> responses = new ArrayList<>();
ShopSubStageEnum shopSubStageEnum = ShopSubStageEnum.getByShopSubStage(shopSubStage);
if (shopSubStageEnum == null){
return new ArrayList<>();
}
return responses;
}
/**
* 通用查询
* @param user
* @param shopSubStageEnum
* @param subStageStatusList
@@ -651,7 +646,6 @@ public class DeskServiceImpl implements DeskService {
/**
* 通用查询
*
* @param user
* @param shopSubStageEnum
* @param subStageStatusList
@@ -665,7 +659,7 @@ public class DeskServiceImpl implements DeskService {
authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
}
}
PageHelper.startPage(deskRequest);
PageHelper.startPage(deskRequest.getPageNum(), deskRequest.getPageSize());
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user == null ? null : user.getUserId(), authRegionIds, ownShopFlag, deskRequest);
PageInfo result = new PageInfo<>(specialShopStageInfo);