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

Merge branch 'cc_20250527_desk' into 'master'

Browse Source 
Cc 20250527 desk

See merge request hangzhou/java/custom_zxjp!105
This commit is contained in:
苏竹红
2025-05-28 12:08:10 +00:00
parent 34be028e62 6d50469af2
commit 861ea11bf1
31 changed files with 578 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -61,26 +61,26 @@ public class DecorationMeasureDAO {
return decorationMeasureMapper.selectByShopId(shopId);
}
public List<PreparationCommonPendingVO> getByMeasureUserIdAndShopStage(String measureUserId){
public List<PreparationCommonPendingVO> getByMeasureUserIdAndShopStage(String measureUserId,String keyword){
if (StringUtil.isBlank(measureUserId)){
return null;
}
return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId);
return decorationMeasureMapper.selectByMeasureUserIdAndShopStage(measureUserId,keyword);
}
//根据设计师和阶段900 查询 店铺id
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(String userId) {
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(String userId,String keyword) {
if (StringUtil.isBlank(userId)){
return new ArrayList<>();
}
return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId);
return decorationMeasureMapper.getShopIdListByDesignUserIdAndShopStage(userId,keyword);
}
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 设计表关联查询
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId) {
public List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(String userId,String keyword) {
if (StringUtil.isBlank(userId)){
return new ArrayList<>();
}
return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId);
return decorationMeasureMapper.getShopIdListByDesignUserIdOrQuotationAndShopStage(userId,keyword);
}
}

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
View File

@@ -119,11 +119,11 @@ public class LineInfoDAO {
return null;
}
public List<LineInfoDO> listByInvestmentManager(String investmentManagerUserId,List<Integer> subStageStatus) {
public List<LineInfoDO> listByInvestmentManager(String investmentManagerUserId,List<Integer> subStageStatus,String keyword) {
if (StringUtils.isBlank(investmentManagerUserId)){
return null;
}
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus);
List<LineInfoDO> lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus,keyword);
return lineInfo;
}
public List<LineInfoDO> listByInterview(String interviewId, Integer interviewType,List<Integer> pendingInterviewStatusList,

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

@@ -63,11 +63,11 @@ public class OperationLogDAO {
return operationLogMapper.getBySubStageStatusEnumAndsStatus(shopId,shopSubStageStatusEnum.getShopSubStageStatus(),type);
}
public List<OperationLogDO> getBySubStageStatusAndUser(String userId,List<Integer> shopSubStageStatus) {
public List<OperationLogDO> getBySubStageStatusAndUser(String userId,List<Integer> shopSubStageStatus,String keyword) {
if ( CollectionUtils.isEmpty(shopSubStageStatus)) {
return null;
}
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus);
return operationLogMapper.getBySubStageStatusAndUser(userId,shopSubStageStatus,keyword);
}
public List<OperationLogDO> getByShopSubStage(Long shopId, List<Integer> shopSubStageList, List<Integer> types) {
if (Objects.isNull(shopId) || CollectionUtils.isEmpty(shopSubStageList)) {

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

@@ -337,8 +337,8 @@ public class ShopStageInfoDAO {
public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,
String investmentUserId,
List<String> authRegionIds,Boolean ownShopFlag) {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag);
List<String> authRegionIds,Boolean ownShopFlag,String keyword) {
return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag, keyword);
}
/**

97
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java Normal file
View File

@@ -0,0 +1,97 @@
package com.cool.store.dao;
import com.cool.store.entity.ShopStageRemarkInfoDO;
import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.mapper.ShopStageRemarkInfoMapper;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* @Author: WangShuo
* @Date: 2025/05/27/14:22
* @Version 1.0
* @注释:
*/
@Repository
public class ShopStageRemarkInfoDAO {
@Autowired
private ShopStageRemarkInfoMapper shopStageRemarkInfoMapper;
public Integer insertOrUpdate(ShopStageRemarkInfoDO shopStageRemarkInfoDO) {
if (shopStageRemarkInfoDO.getId() != null) {
return shopStageRemarkInfoMapper.updateByPrimaryKeySelective(shopStageRemarkInfoDO);
} else {
return shopStageRemarkInfoMapper.insertSelective(shopStageRemarkInfoDO);
}
}
public ShopStageRemarkInfoDO getByShopIdAndStage(Long shopId, Integer shopSubStageStatus) {
if (Objects.isNull(shopId) || Objects.isNull(shopSubStageStatus)){
return new ShopStageRemarkInfoDO();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andEqualTo("shopId", shopId).andEqualTo("shopSubStageStatus", shopSubStageStatus);
ShopStageRemarkInfoDO shopStageRemarkInfoDO = shopStageRemarkInfoMapper.selectOneByExample(example);
if (Objects.isNull(shopStageRemarkInfoDO)){
return new ShopStageRemarkInfoDO();
}
return shopStageRemarkInfoDO;
}
public ShopStageRemarkInfoDO getByLineIdAndStage(Long lineId, Integer workflowSubStageStatus) {
if (Objects.isNull(lineId) || Objects.isNull(workflowSubStageStatus)){
return new ShopStageRemarkInfoDO();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andEqualTo("lineId", lineId).andEqualTo("workflowSubStageStatus", workflowSubStageStatus);
ShopStageRemarkInfoDO shopStageRemarkInfoDO = shopStageRemarkInfoMapper.selectOneByExample(example);
if (Objects.isNull(shopStageRemarkInfoDO)){
return new ShopStageRemarkInfoDO();
}
return shopStageRemarkInfoDO;
}
public List<ShopStageRemarkInfoDO> getByShopIdsAndStage(List<Long> shopIds, List<Integer> shopSubStageStatusList) {
if (CollectionUtils.isEmpty(shopIds) || CollectionUtils.isEmpty(shopSubStageStatusList)){
return new ArrayList<>();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andIn("shopId", shopIds).andIn("shopSubStageStatus", shopSubStageStatusList);
List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
if (CollectionUtils.isEmpty(result)){
return new ArrayList<>();
}
return result ;
}
public List<ShopStageRemarkInfoDO> getByShopIdsAndStages(List<Long> shopIds, List<Integer> shopSubStageList) {
if (CollectionUtils.isEmpty(shopIds) || CollectionUtils.isEmpty(shopSubStageList)){
return new ArrayList<>();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andIn("shopId", shopIds).andIn("shopSubStage", shopSubStageList);
List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
if (CollectionUtils.isEmpty(result)){
return new ArrayList<>();
}
return result ;
}
public List<ShopStageRemarkInfoDO> getByLineIdsAndStage(List<Long> lineIds, List<Integer> workflowSubStageStatusList) {
if (CollectionUtils.isEmpty(lineIds) || CollectionUtils.isEmpty(workflowSubStageStatusList)){
return new ArrayList<>();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andIn("lineId", lineIds).andIn("workflowSubStageStatus", workflowSubStageStatusList);
List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
if (CollectionUtils.isEmpty(result)){
return new ArrayList<>();
}
return result ;
}
}

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

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

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

@@ -17,9 +17,9 @@ public interface DecorationMeasureMapper extends Mapper<DecorationMeasureDO> {
*/
DecorationMeasureDO selectByShopId(Long shopId);
List<PreparationCommonPendingVO> selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId);
List<PreparationCommonPendingVO> selectByMeasureUserIdAndShopStage(@Param("measureUserId") String measureUserId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId);
List<PreparationCommonPendingVO> getShopIdListByDesignUserIdOrQuotationAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword);
}

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

@@ -29,7 +29,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
* @param investmentManagerUserId
* @return
*/
List<LineInfoDO> listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List<Integer> codes);
List<LineInfoDO> listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("codes") List<Integer> codes,@Param("keyword")String keyword);
/**
* 面试官待处理

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

@@ -24,7 +24,7 @@ public interface OperationLogMapper extends Mapper<OperationLogDO> {
Long batchAddOperationLog(@Param("list") List<OperationLogDO> operationLogDO) ;
List<OperationLogDO> getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List<Integer> shopSubStageStatus );
List<OperationLogDO> getBySubStageStatusAndUser(@Param("userId") String userId, @Param("list") List<Integer> shopSubStageStatus,@Param("keyword")String keyword );
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

@@ -148,7 +148,8 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId,
@Param("authRegionIds") List<String> authRegionIds,
@Param("ownShopFlag") Boolean ownShopFlag);
@Param("ownShopFlag") Boolean ownShopFlag,
@Param("keyword") String keyword);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);

14
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageRemarkInfoMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.cool.store.mapper;
import com.cool.store.entity.ShopStageRemarkInfoDO;
import tk.mybatis.mapper.common.Mapper;
/**
* @Author: WangShuo
* @Date: 2025/05/27/14:19
* @Version 1.0
* @注释:
*/
public interface ShopStageRemarkInfoMapper extends Mapper<ShopStageRemarkInfoDO> {
}

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

@@ -56,6 +56,9 @@
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>
order by b.update_time desc
</select>

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

@@ -52,6 +52,9 @@
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>
order by b.update_time desc
</select>
<select id="getShopIdListByDesignUserIdAndShopStage" resultType="com.cool.store.vo.desk.PreparationCommonPendingVO">
@@ -77,6 +80,9 @@
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>
order by b.update_time desc
</select>
<select id="getShopIdListByDesignUserIdOrQuotationAndShopStage" resultType="com.cool.store.vo.desk.PreparationCommonPendingVO">
@@ -102,6 +108,9 @@
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>
order by b.update_time desc
</select>

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

@@ -353,6 +353,9 @@
#{code}
</foreach>
</if>
<if test="keyword !=null and keyword !=''">
and (username like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%'))
</if>
order by update_time desc
</select>

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

@@ -90,6 +90,9 @@
#{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>
order by a.create_time desc
</select>
<select id="getByCondition" resultType="com.cool.store.entity.OperationLogDO">

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

@@ -339,6 +339,9 @@
and si.join_mode != 3
</if>
</if>
<if test="keyword!=null and keyword !=''">
and (si.shop_name like concat('%',#{keyword},'%') or si.shop_code like concat('%',#{keyword},'%'))
</if>
order by a.update_time desc
</where>

21
coolstore-partner-dao/src/main/resources/mapper/ShopStageRemarkInfoMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
<mapper namespace="com.cool.store.mapper.ShopStageRemarkInfoMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.ShopStageRemarkInfoDO">
<result column="id" property="id" jdbcType="BIGINT" />
<result column="shop_id" property="shopId" jdbcType="BIGINT" />
<result column="shop_sub_stage" property="shopSubStage" jdbcType="INTEGER" />
<result column="shop_sub_stage_status" property="shopSubStageStatus" jdbcType="INTEGER" />
<result column="line_id" property="lineId" jdbcType="BIGINT" />
<result column="workflow_sub_stage" property="workflowSubStage" jdbcType="INTEGER" />
<result column="workflow_sub_stage_status" property="workflowSubStageStatus" jdbcType="INTEGER" />
<result column="remark" property="remark" jdbcType="VARCHAR" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="create_user_id" property="createUserId" jdbcType="VARCHAR" />
<result column="update_user_id" property="updateUserId" jdbcType="VARCHAR" />
</resultMap>
</mapper>

52
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopStageRemarkInfoDO.java Normal file
View File

@@ -0,0 +1,52 @@
package com.cool.store.entity;
import lombok.Data;
import javax.persistence.*;
import java.util.Date;
/**
* 阶段注释表
*/
@Data
@Entity
@Table(name = "xfsg_shop_stage_remark_info")
public class ShopStageRemarkInfoDO {
@Id
@Column(name = "id")
private Long id;
@Column(name = "shop_id")
private Long shopId;
@Column(name = "shop_sub_stage")
private Integer shopSubStage;
@Column(name = "shop_sub_stage_status")
private Integer shopSubStageStatus;
@Column(name = "line_id")
private Long lineId;
@Column(name = "workflow_sub_stage")
private Integer workflowSubStage;
@Column(name = "workflow_sub_stage_status")
private Integer workflowSubStageStatus;
@Column(name = "remark")
private String remark;
@Column(name = "create_time")
private Date createTime;
@Column(name = "update_time")
private Date updateTime;
@Column(name = "create_user_id")
private String createUserId;
@Column(name = "update_user_id")
private String updateUserId;
}

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

@@ -0,0 +1,28 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/05/27/15:02
* @Version 1.0
* @注释:
*/
@Data
public class BusinessRemarkRequest {
@ApiModelProperty("使用-资质审核，意向金，意向协议")
private Long lineId;
@ApiModelProperty("使用-资质审核，意向金，意向协议：流程子阶段")
private Integer workflowSubStage;
@ApiModelProperty("使用-资质审核，意向金，意向协议：流程子阶段状态")
private Integer workflowSubStageStatus;
@ApiModelProperty("使用-除了资质审核，意向金，意向协议：店铺id")
private Long shopId;
@ApiModelProperty("使用-除了资质审核，意向金，意向协议：子阶段")
private Integer subStage;
@ApiModelProperty("使用-除了资质审核，意向金，意向协议：阶段状态")
private Integer subStageStatus;
@ApiModelProperty("业务备注")
private String businessRemark;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java
View File

@@ -53,4 +53,7 @@ public class OpeningOperationPlanListVO {
@ApiModelProperty("阶段状态")
private Integer subStageStatus;
@ApiModelProperty("业务备注")
private String businessRemark;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java
View File

@@ -22,6 +22,9 @@ public class IntendPendingVO extends BaseInfoVO {
private Date updateTime;
@ApiModelProperty("业务备注")
private String businessRemark;
public IntendPendingVO(){}
public IntendPendingVO(BaseInfoVO baseInfoVO) {

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java
View File

@@ -17,6 +17,8 @@ public class PayStagePendingVO extends BaseInfoVO {
@ApiModelProperty("缴费时间 2024年04月23日 16:00")
private String payTime;
private Date updateTime;
@ApiModelProperty("业务备注")
private String businessRemark;
public PayStagePendingVO(){};
public PayStagePendingVO(BaseInfoVO baseInfoVO) {

3
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java
View File

@@ -51,5 +51,6 @@ public class PreparationCommonPendingVO {
private Date updateTime;
@ApiModelProperty("签约类型")
private Integer signType;
@ApiModelProperty("业务备注")
private String businessRemark;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java
View File

@@ -17,7 +17,8 @@ public class SigningPendingVO extends BaseInfoVO {
@ApiModelProperty("提交时间 2024年04月23日 16:00")
private String submitTime;
private Date updateTime;
@ApiModelProperty("业务备注")
private String businessRemark;
public SigningPendingVO(){};
public SigningPendingVO(BaseInfoVO baseInfoVO) {

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

@@ -5,6 +5,7 @@ import com.cool.store.dto.InvestmentCountDTO;
import com.cool.store.dto.PendingCountDTO;
import com.cool.store.entity.HyPartnerLabelDO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.vo.BaseInfoVO;
import com.cool.store.vo.desk.*;
import com.github.pagehelper.PageInfo;
@@ -27,7 +28,7 @@ public interface DeskService {
* @param userId
* @return
*/
PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize,String userId);
PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize,String userId,String keyword);
/**
@@ -37,7 +38,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
@@ -47,7 +48,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
@@ -83,7 +84,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 加盟合同签约待处理数据
* @param pageNum
@@ -91,7 +92,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
@@ -101,7 +102,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 开业运营方案待处理数据
* @param pageNum
@@ -109,7 +110,7 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 培训清单待处理数据
@@ -118,64 +119,64 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 信发系统
*/
PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* pos
*/
PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 营帐通
*/
PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* orderSys
*/
PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 设计阶段
*/
PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 施工阶段
*/
PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 装修验收阶段
*/
PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 抖音阶段
*/
PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 快手
*/
PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 美团外卖
*/
PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 美团团购
*/
PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 饿了么
*/
PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 建店资料
*/
PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 测量阶段
@@ -184,20 +185,22 @@ public interface DeskService {
* @param user
* @return
*/
PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 营业执照
*/
PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 食品安全许可证
*/
PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
/**
* 京东外卖
*/
PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword);
Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user);
}

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

@@ -8,14 +8,17 @@ import com.cool.store.dto.InvestmentCountDTO;
import com.cool.store.dto.PendingCountDTO;
import com.cool.store.dto.openPreparation.PlanLineDTO;
import com.cool.store.entity.*;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.enums.point.PayBusinessTypeEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.EnterpriseUserRoleMapper;
import com.cool.store.mapper.IntentAgreementMapper;
import com.cool.store.mapper.TrainingExperienceMapper;
import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.service.DeskService;
import com.cool.store.service.RegionService;
import com.cool.store.service.SysRoleService;
@@ -40,6 +43,7 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.cool.store.enums.WorkflowSubStageStatusEnum.INTENT_5;
import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START;
import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS;
@@ -92,15 +96,20 @@ public class DeskServiceImpl implements DeskService {
private AcceptanceInfoDAO acceptanceInfoDAO;
@Autowired
private PointInfoDAO pointInfoDAO;
@Autowired
private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO;
@Override
public PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize, String userId) {
public PageInfo<IntendPendingVO> intendPendingList(Integer pageNum, Integer pageSize, String userId,String keyword) {
PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(WorkflowSubStageStatusEnum.INTENT_5.getCode()));
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(userId, Arrays.asList(INTENT_5.getCode()),keyword);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
Map<Long, String> wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds);
List<Long> lineIds = lineInfoDOS.stream().map(LineInfoDO::getId).collect(Collectors.toList());
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByLineIdsAndStage(lineIds, Arrays.asList(INTENT_5.getCode()));
Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getLineId, Function.identity()));
List<IntendPendingVO> list = new ArrayList<>();
lineInfoDOS.forEach(x -> {
BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap);
@@ -108,6 +117,7 @@ public class DeskServiceImpl implements DeskService {
intendPendingVO.setJoinTime(new Date());
intendPendingVO.setJoinMode(x.getJoinMode());
intendPendingVO.setUpdateTime(x.getUpdateTime());
intendPendingVO.setBusinessRemark(remarkInfoMap.getOrDefault(x.getId(), new ShopStageRemarkInfoDO()).getRemark());
list.add(intendPendingVO);
});
@@ -117,9 +127,9 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PayStagePendingVO> payStagePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()));
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(), Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()),keyword);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -127,6 +137,9 @@ public class DeskServiceImpl implements DeskService {
List<Long> lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList());
Map<Long, LinePayDO> payMap = linePayDAO.getLinePayByLineIds(lineIds, PayBusinessTypeEnum.INTENT_MONEY.getCode());
List<PayStagePendingVO> list = new ArrayList<>();
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByLineIdsAndStage(lineIds, Arrays.asList(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()));
Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getLineId, Function.identity()));
lineInfoDOS.forEach(x -> {
BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap);
PayStagePendingVO payStagePendingVO = new PayStagePendingVO(baseInfoVO);
@@ -135,7 +148,7 @@ public class DeskServiceImpl implements DeskService {
payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime()));
}
payStagePendingVO.setUpdateTime(x.getUpdateTime());
payStagePendingVO.setBusinessRemark(remarkInfoMap.getOrDefault(x.getId(), new ShopStageRemarkInfoDO()).getRemark());
list.add(payStagePendingVO);
});
page.setList(list);
@@ -143,10 +156,10 @@ public class DeskServiceImpl implements DeskService {
}
@Override
public PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<SigningPendingVO> signingPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
PageHelper.startPage(pageNum, pageSize);
List<LineInfoDO> lineInfoDOS = lineInfoDAO.listByInvestmentManager(user.getUserId(),
Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()));
Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()),keyword);
PageInfo page = new PageInfo(lineInfoDOS);
Map<Long, HyPartnerLabelDO> userPortraitMap = this.getUserPortraitMap(lineInfoDOS);
List<Long> wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
@@ -154,6 +167,8 @@ public class DeskServiceImpl implements DeskService {
List<Long> lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList());
List<SigningBaseInfoDO> signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds);
Map<Long, Date> dateMap = signingBaseInfoDOS.stream().collect(Collectors.toMap(SigningBaseInfoDO::getLineId, SigningBaseInfoDO::getCreateTime));
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByLineIdsAndStage(lineIds, Arrays.asList(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()));
Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getLineId, Function.identity()));
List<SigningPendingVO> list = new ArrayList<>();
lineInfoDOS.forEach(x -> {
BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap);
@@ -163,6 +178,7 @@ public class DeskServiceImpl implements DeskService {
signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date));
}
signingPendingVO.setUpdateTime(x.getUpdateTime());
signingPendingVO.setBusinessRemark(remarkInfoMap.getOrDefault(x.getId(), new ShopStageRemarkInfoDO()).getRemark());
list.add(signingPendingVO);
});
page.setList(list);
@@ -239,7 +255,7 @@ public class DeskServiceImpl implements DeskService {
@Override
public PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> payFranchiseFeesPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
PageInfo<PreparationCommonPendingVO> pageInfo = new PageInfo<>();
List<Integer> subStageStatusList = new ArrayList<>();
@@ -247,7 +263,7 @@ public class DeskServiceImpl implements DeskService {
//督导代填
if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()), Boolean.FALSE);
Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()), Boolean.FALSE,keyword);
} else {
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
@@ -257,7 +273,7 @@ public class DeskServiceImpl implements DeskService {
}
if (!subStageStatusList.isEmpty()) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
subStageStatusList, Boolean.TRUE);
subStageStatusList, Boolean.TRUE,keyword);
}
}
}
@@ -265,63 +281,63 @@ public class DeskServiceImpl implements DeskService {
}
@Override
public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> signingOfFranchiseContractPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
PageInfo<PreparationCommonPendingVO> pageInfo = commonPendingVOPageInfo(pageNum, pageSize, 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);
Arrays.asList(SHOP_SUB_STAGE_STATUS_80.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_85.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_83.getShopSubStageStatus()), Boolean.TRUE,keyword);
return pageInfo;
}
@Override
public PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> invoiceReturnPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8_5,
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE);
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE);
public PageInfo<PreparationCommonPendingVO> openingAndOperationPlanPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_14, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> trainListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_5,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE);
Collections.singletonList(SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus()), Boolean.TRUE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE);
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE);
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE);
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE);
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
List<Integer> subStageStatusList = new ArrayList<>();
//报价员和管理员不指定人，看阶段符合的全部数据
@@ -335,10 +351,10 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_902.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);
return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_9, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,keyword);
} else {
List<PreparationCommonPendingVO> list = new ArrayList<>();
list = getDesignPendingVO(pageNum, pageSize, user, userRoleIds);
list = getDesignPendingVO(pageNum, pageSize, user, userRoleIds,keyword);
if (CollectionUtils.isEmpty(list)) {
return new PageInfo<>();
@@ -373,71 +389,98 @@ public class DeskServiceImpl implements DeskService {
}
}
private List<PreparationCommonPendingVO> getDesignPendingVO(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Long> userRoleIds) {
private List<PreparationCommonPendingVO> getDesignPendingVO(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Long> userRoleIds,String keyword) {
//只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) {
PageHelper.startPage(pageNum, pageSize);
return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId());
List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId(), keyword);
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()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
}
return resultList;
}
//只有设计师 查询 指定当前用户和阶段为 901 设计中
//只有设计师 查询 指定当前用户和阶段为 901
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
PageHelper.startPage(pageNum, pageSize);
return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId());
List<PreparationCommonPendingVO> resultList = decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId(),keyword);
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()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
}
return resultList;
}
//有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中
if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) {
PageHelper.startPage(pageNum, pageSize);
return decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId());
List<PreparationCommonPendingVO> resultList = decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId(),keyword);
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()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
for (PreparationCommonPendingVO preparationCommonPendingVO : resultList){
List<ShopStageRemarkInfoDO> remarkInfoList = remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ArrayList<>());
Map<Integer, String> remarkMapByShopSubStageStatus = remarkInfoList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
preparationCommonPendingVO.setBusinessRemark(remarkMapByShopSubStageStatus.getOrDefault(preparationCommonPendingVO.getSubStageStatus(), ""));
}
return resultList;
}
return null;
}
@Override
public PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11,
Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(),
ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE);
ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> fitmentPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_12,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE);
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122.getShopSubStageStatus()), Boolean.FALSE,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> DYPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus()),keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> KSPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()),keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> MTPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus()),keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> MTBuyPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()),keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> ELMEPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()),keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15,
Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE );
Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE,keyword );
}
//如果不是财务角色或者即是财务又是自有店财务 则不需要标识
Boolean ownShopFlag = null;
@@ -472,11 +515,11 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.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);
return commonPendingVOPage(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,ownShopFlag,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
List<Integer> subStageStatusList = new ArrayList<>();
Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
@@ -486,12 +529,12 @@ public class DeskServiceImpl implements DeskService {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.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);
return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_8_6, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,keyword);
}
if (userRoleIds.contains(UserRoleEnum.MEASURE_OFFICE.getCode())) {
PageHelper.startPage(pageNum, pageSize);
List<PreparationCommonPendingVO> list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId());
List<PreparationCommonPendingVO> list = decorationMeasureDAO.getByMeasureUserIdAndShopStage(user.getUserId(),keyword);
if (CollectionUtils.isEmpty(list)) {
return new PageInfo<>();
}
@@ -507,12 +550,15 @@ public class DeskServiceImpl implements DeskService {
Set<String> investmentManagerIds = list.stream().map(PreparationCommonPendingVO::getInvestmentManager).collect(Collectors.toSet());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(investmentManagerIds));
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862.getShopSubStageStatus()));
Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopId, Function.identity()));
for (PreparationCommonPendingVO preparationCommonPendingVO : list) {
LineInfoDO lineInfoDO = lineMap.get(preparationCommonPendingVO.getLineId());
if (lineInfoDO == null) {
continue;
}
preparationCommonPendingVO.setBusinessRemark(remarkInfoMap.getOrDefault(preparationCommonPendingVO.getShopId(), new ShopStageRemarkInfoDO()).getRemark());
preparationCommonPendingVO.setSignType(signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(), new SignFranchiseDO()).getSignType());
preparationCommonPendingVO.setPartnerName(lineInfoDO.getUsername());
preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile());
@@ -525,22 +571,52 @@ public class DeskServiceImpl implements DeskService {
}
@Override
public PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_3,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE );
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE ,keyword);
}
@Override
public PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
public PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_4,
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE );
Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE,keyword );
}
@Override
public PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()));
public PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user,String keyword) {
return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()),keyword);
}
@Override
public Integer submitBusinessRemark(BusinessRemarkRequest request, LoginUserInfo user){
if (!((request.getShopId() != null&&request.getSubStage()!=null&&request.getSubStageStatus()!=null)
||(request.getLineId()!=null&&request.getWorkflowSubStage()!=null&&request.getWorkflowSubStageStatus()!=null))){
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
ShopStageRemarkInfoDO remarkInfoDO = new ShopStageRemarkInfoDO();
if (request.getShopId() != null){
remarkInfoDO = shopStageRemarkInfoDAO.getByShopIdAndStage(request.getShopId(),request.getSubStageStatus());
remarkInfoDO.setShopId(request.getShopId());
remarkInfoDO.setShopSubStage(request.getSubStage());
remarkInfoDO.setShopSubStageStatus(request.getSubStageStatus());
}else if (request.getLineId() != null){
remarkInfoDO = shopStageRemarkInfoDAO.getByLineIdAndStage(request.getLineId(),request.getWorkflowSubStageStatus());
remarkInfoDO.setLineId(request.getLineId());
remarkInfoDO.setWorkflowSubStage(request.getWorkflowSubStage());
remarkInfoDO.setWorkflowSubStageStatus(request.getWorkflowSubStageStatus());
}
remarkInfoDO.setRemark(request.getBusinessRemark());
if(remarkInfoDO.getCreateTime()==null){
remarkInfoDO.setCreateTime(new Date());
}
if (StringUtil.isBlank(remarkInfoDO.getCreateUserId())){
remarkInfoDO.setCreateUserId(user.getUserId());
}
remarkInfoDO.setUpdateTime(new Date());
remarkInfoDO.setUpdateUserId(user.getUserId());
return shopStageRemarkInfoDAO.insertOrUpdate(remarkInfoDO);
}
/**
* 通用查询
@@ -552,8 +628,8 @@ public class DeskServiceImpl implements DeskService {
* @param filterFlag
* @return
*/
private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag){
return this.commonPendingVOPage(pageNum,pageSize,user,shopSubStageEnum,subStageStatusList,filterFlag,null);
private PageInfo<PreparationCommonPendingVO> commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag,String keyword){
return this.commonPendingVOPage(pageNum,pageSize,user,shopSubStageEnum,subStageStatusList,filterFlag,null,keyword);
}
/**
@@ -566,7 +642,7 @@ public class DeskServiceImpl implements DeskService {
* @param subStageStatusList
* @return
*/
private PageInfo<PreparationCommonPendingVO> commonPendingVOPage(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag,Boolean ownShopFlag) {
private PageInfo<PreparationCommonPendingVO> commonPendingVOPage(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List<Integer> subStageStatusList, Boolean filterFlag,Boolean ownShopFlag,String keyword) {
//user.getJobNumber()
List<String> authRegionIds = new ArrayList<>();
if (filterFlag) {
@@ -576,7 +652,7 @@ public class DeskServiceImpl implements DeskService {
}
PageHelper.startPage(pageNum, pageSize);
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user == null ? null : user.getUserId(), authRegionIds,ownShopFlag);
subStageStatusList, user == null ? null : user.getUserId(), authRegionIds,ownShopFlag,keyword);
PageInfo result = new PageInfo<>(specialShopStageInfo);
List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());
@@ -598,10 +674,15 @@ public class DeskServiceImpl implements DeskService {
List<String> developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, subStageStatusList);
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
List<PreparationCommonPendingVO> list = new ArrayList<>();
specialShopStageInfo.forEach(x -> {
PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO();
List<ShopStageRemarkInfoDO> remarkInfoMapOrDefault = remarkInfoMap.getOrDefault(x.getShopId(), new ArrayList<>());
Map<Integer, ShopStageRemarkInfoDO> remarkInfoMapByStageStatus = remarkInfoMapOrDefault.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, Function.identity()));
preparationCommonPendingVO.setBusinessRemark(remarkInfoMapByStageStatus.getOrDefault(x.getShopSubStageStatus(), new ShopStageRemarkInfoDO()).getRemark());
preparationCommonPendingVO.setLineId(x.getLineId());
preparationCommonPendingVO.setShopId(x.getShopId());
ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO());
@@ -658,9 +739,9 @@ public class DeskServiceImpl implements DeskService {
}
//平台建店通用查询
private PageInfo<PreparationCommonPendingVO> commonPlatformBuild(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Integer> subStageStatusList) {
private PageInfo<PreparationCommonPendingVO> commonPlatformBuild(Integer pageNum, Integer pageSize, LoginUserInfo user, List<Integer> subStageStatusList,String keyword) {
PageHelper.startPage(pageNum, pageSize);
List<OperationLogDO> operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList);
List<OperationLogDO> operationLogDOList = operationLogDAO.getBySubStageStatusAndUser(user.getUserId(), subStageStatusList,keyword);
if (CollectionUtils.isEmpty(operationLogDOList)) {
return new PageInfo<>();
}
@@ -686,10 +767,13 @@ public class DeskServiceImpl implements DeskService {
List<String> developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, subStageStatusList);
Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopId, Function.identity()));
List<PreparationCommonPendingVO> list = new ArrayList<>();
operationLogDOList.forEach(x -> {
PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO();
preparationCommonPendingVO.setBusinessRemark(remarkInfoMap.getOrDefault(x.getShopId(), new ShopStageRemarkInfoDO()).getRemark());
ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO());
preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType());
preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode());

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

@@ -153,7 +153,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
//查集团维度
if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) {
for (FranchiseReportResponse responseByJoinGroupName : responseByJoinGroupNameMap.values()) {
List<Long> regionIds = responseByJoinGroupName.getRegionIds();
Set<Long> regionIds = new HashSet<>(responseByJoinGroupName.getRegionIds());
for (Long regionId : regionIds) {
BigRegionDO bigRegionDO = bigRegionDOMap.get(regionId);
List<FranchiseReportDTO> yesterdayList = yesterdayMap.getOrDefault(bigRegionDO.getRegionId(), new ArrayList<>());

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -45,6 +45,8 @@ import java.util.stream.Collectors;
@Slf4j
public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
@Resource
private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO;
@Resource
private OpeningOperationPlanDAO openingOperationPlanDAO;
@Resource
@@ -217,6 +219,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
//阶段状态
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage());
Map<Long, ShopStageInfoDO> subStageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto -> dto));
List<ShopStageRemarkInfoDO> shopStageRemarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStages(shopIds, Arrays.asList(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = shopStageRemarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
List<OpeningOperationPlanListVO> openingOperationPlanListVOList = new ArrayList<>();
openPlanShopInfoDTOS.forEach(x -> {
OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
@@ -236,6 +240,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime());
openingOperationPlanListVO.setResultType(x.getResultType());
openingOperationPlanListVO.setSubStageStatus(subStageMap.getOrDefault(x.getShopId(),new ShopStageInfoDO()).getShopSubStageStatus());
List<ShopStageRemarkInfoDO> remarkInfoMapOrDefault = remarkInfoMap.getOrDefault(x.getShopId(), new ArrayList<>());
Map<Integer,String> remarkInfoMapByStageStatus = remarkInfoMapOrDefault.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
openingOperationPlanListVO.setBusinessRemark(remarkInfoMapByStageStatus.getOrDefault(openingOperationPlanListVO.getSubStageStatus(), ""));
openingOperationPlanListVOList.add(openingOperationPlanListVO);
});
pageInfo.setList(openingOperationPlanListVOList);

37
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -137,7 +137,7 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setWqfAccount(shopInfo.getShopCode());
request.setDownstreamSystemShopName(shopInfo.getShopName());
if (DownSystemTypeEnum.XGJ.equals(systemType)) {
request.setDownstreamSystemShopName(getXgjShopName(lineInfoDO, shopInfo));
request.setDownstreamSystemShopName(getXgjShopName(lineInfoDO, shopInfo,signFranchiseDO));
}
if (DownSystemTypeEnum.POS.equals(systemType)) {
if (buildInformationDO != null) {
@@ -274,32 +274,43 @@ public class SyncDataServiceImpl implements SyncDataService {
return null;
}
public String getXgjShopName(LineInfoDO lineInfoDO, ShopInfoDO shopInfoDO) {
public String getXgjShopName(LineInfoDO lineInfoDO, ShopInfoDO shopInfoDO,SignFranchiseDO signFranchiseDO) {
if (StringUtils.isBlank(shopInfoDO.getShopCode())) {
return null;
}
String shopCode = shopInfoDO.getShopCode().trim();
Boolean partnershipSignatorySecondIsNull = StringUtils.isBlank(signFranchiseDO.getPartnershipSignatorySecond());
if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
//M10001
if (shopCode.matches("M\\d*")) {
return "MX" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
//FS10001
if (shopCode.matches("FS\\d*")) {
return "FS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
// MS10001
if (shopCode.matches("MS\\d*")) {
return "MS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
// S10001
if (shopCode.matches("S\\d*")) {
return shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
}
if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
if (shopCode.matches("MZGM\\d*")) {
return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
if (shopCode.matches("MZGS\\d*")) {
return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName();
@@ -307,13 +318,19 @@ public class SyncDataServiceImpl implements SyncDataService {
}
if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
if (shopCode.matches("LX\\d*")) {
return "LX" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
if (shopCode.matches("X\\d*")) {
return "X" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
if (shopCode.matches("Q\\d*")) {
return "Q" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")";
return partnershipSignatorySecondIsNull
? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
: "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
}
if (shopCode.matches("Z\\d*")) {
return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();

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

@@ -4,16 +4,14 @@ import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.InvestmentCountDTO;
import com.cool.store.dto.PendingCountDTO;
import com.cool.store.request.BusinessRemarkRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.DeskService;
import com.cool.store.vo.desk.*;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -33,36 +31,36 @@ public class DeskController {
@ApiOperation("待处理-加盟申请")
@GetMapping("/intendPendingList")
public ResponseResult<PageInfo<IntendPendingVO>> intendPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<IntendPendingVO>> intendPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize
, @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.intendPendingList(pageNumber,pageSize,userInfo.getUserId()));
return ResponseResult.success(deskService.intendPendingList(pageNumber, pageSize, userInfo.getUserId(),keyword));
}
@ApiOperation("待处理-缴纳意向金")
@GetMapping("/payStagePendingList")
public ResponseResult<PageInfo<PayStagePendingVO>> payStagePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PayStagePendingVO>> payStagePendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize
, @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.payStagePendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.payStagePendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-意向协议")
@GetMapping("/signingPendingList")
public ResponseResult<PageInfo<SigningPendingVO>> signingPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<SigningPendingVO>> signingPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.signingPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.signingPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-数据")
@GetMapping("/getPendingCount")
public ResponseResult<PendingCountDTO> getPendingCount(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PendingCountDTO> getPendingCount(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize ) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.getPendingCount(userInfo));
}
@@ -77,162 +75,182 @@ public class DeskController {
@ApiOperation("待处理-支付加盟费保证金")
@GetMapping("/payFranchiseFeesPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> payFranchiseFeesPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.payFranchiseFeesPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-签约加盟合同")
@GetMapping("/signingOfFranchiseContractPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> signingOfFranchiseContractPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> signingOfFranchiseContractPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.signingOfFranchiseContractPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.signingOfFranchiseContractPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-发票回传")
@GetMapping("/invoiceReturnPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> invoiceReturnPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> invoiceReturnPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.invoiceReturnPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.invoiceReturnPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-开店运营方案")
@GetMapping("/openingAndOperationPlanPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingAndOperationPlanPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> openingAndOperationPlanPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.openingAndOperationPlanPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-培训登记")
@GetMapping("/trainListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> trainListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.trainListPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.trainListPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-信发系统")
@GetMapping("/xinFaListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.xinFaListPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.xinFaListPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-pos")
@GetMapping("/posListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.posListPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.posListPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-营帐通")
@GetMapping("/tentPassListPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> tentPassListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> tentPassListPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.tentPassListPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.tentPassListPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-订货系统")
@GetMapping("/orderSysPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> orderSysPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> orderSysPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.orderSysPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.orderSysPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-设计阶段")
@GetMapping("/designPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> designPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> designPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.designPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.designPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-施工阶段")
@GetMapping("/constructionPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> constructionPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> constructionPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.constructionPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.constructionPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-装修验收阶段")
@GetMapping("/fitmentPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> fitmentPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> fitmentPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.fitmentPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.fitmentPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-抖音阶段")
@GetMapping("/DYPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> DYPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> DYPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.DYPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.DYPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-快手")
@GetMapping("/KSPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> KSPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> KSPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.KSPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.KSPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-美团外卖")
@GetMapping("/MTPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.MTPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.MTPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-美团团购")
@GetMapping("/MTBuyPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTButPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> MTButPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.MTBuyPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.MTBuyPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-饿了么")
@GetMapping("/ELMEPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> ELMEPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> ELMEPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.ELMEPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.ELMEPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-建店资料")
@GetMapping("/buildInformationPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> buildInformationPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> buildInformationPendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.buildInformationPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.buildInformationPendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-测量阶段")
@GetMapping("/measurePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize , @RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.measurePendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.measurePendingList(pageNumber, pageSize, userInfo,keyword));
}
@ApiOperation("待处理-营业执照")
@GetMapping("/businessLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword){
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo,keyword));
}
@ApiOperation("待处理-食品许可证")
@GetMapping("/foodLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo,keyword));
}
@ApiOperation("待处理-京东外卖")
@GetMapping("/JingDongPendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> JingDongPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize,@RequestParam(value = "keyword") String keyword) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.JingDongPendingList(pageNumber,pageSize,userInfo));
return ResponseResult.success(deskService.JingDongPendingList(pageNumber,pageSize,userInfo,keyword));
}
@ApiOperation("提交业务备注")
@PostMapping("/submitBusinessRemark")
public ResponseResult<Integer> submitBusinessRemark(@RequestBody BusinessRemarkRequest request) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.submitBusinessRemark(request,userInfo));
}
}