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

工作台搜索

Browse Source
This commit is contained in:
shuo.wang
2025-05-27 13:49:30 +08:00
parent 7b30396dae
commit e281730b84
22 changed files with 214 additions and 171 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);
}
/**

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);

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>