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

Merge #46 into master from cc_20251208_visit

Browse Source 
fix:拜访线索查询逻辑修改

* cc_20251208_visit: (40 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch 'master' into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

  - fix:过滤未分配招商经理的线索

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch 'master' into cc_20251208_visit

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - fix:铺位导出新增字段

  - fix:铺位导出新增字段

  - fix

  - fix:我的铺位导出

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java

  - fix:拜访线索查询逻辑修改

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/46
This commit is contained in:
王非凡
2026-02-26 10:30:35 +00:00
committed by 正新
parent 98652ccb1d
commit 7916851939
6 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,10 +209,10 @@ public class LineInfoDAO {
} }
/** /**
* 查询已分配招商经理的所有线索 * 查询所有线索
*/ */
public List<LineVO> getLinesAssignInvestManager(String keyword) { public List<LineVO> getLinesIncludeMobile(String keyword) {
return lineInfoMapper.getLinesAssignInvestManager(keyword); return lineInfoMapper.getLinesIncludeMobile(keyword);
} }
public List<LineInfoDO> getByLineIds(List<Long> lineIds){ public List<LineInfoDO> getByLineIds(List<Long> lineIds){

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

@@ -4,7 +4,6 @@ import com.cool.store.dto.InvestmentCountDTO;
import com.cool.store.dto.PendingCountDTO; import com.cool.store.dto.PendingCountDTO;
import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.dto.openPreparation.PlanLineDTO;
import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.LineInfoDO;
import com.cool.store.entity.ShopInfoDO;
import com.cool.store.request.LineListRequest; import com.cool.store.request.LineListRequest;
import com.cool.store.request.PartnerRequest; import com.cool.store.request.PartnerRequest;
import com.cool.store.request.PointLinePageRequest; import com.cool.store.request.PointLinePageRequest;
@@ -136,7 +135,7 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
List<LineVO> getLinesByKeyword(@Param("keyword") String keyword); List<LineVO> getLinesByKeyword(@Param("keyword") String keyword);
/** /**
* 查询已分配招商经理的所有线索 * 查询所有线索
*/ */
List<LineVO> getLinesAssignInvestManager(@Param("keyword") String keyword); List<LineVO> getLinesIncludeMobile(@Param("keyword") String keyword);
} }

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

@@ -650,14 +650,15 @@
order by id desc order by id desc
</select> </select>
<select id="getLinesAssignInvestManager" resultType="com.cool.store.vo.LineVO"> <select id="getLinesIncludeMobile" resultType="com.cool.store.vo.LineVO">
select select
id as lineId, id as lineId,
username, username,
mobile mobile
from xfsg_line_info from xfsg_line_info
<where> <where>
AND (investment_manager IS NOT NULL AND investment_manager != '') and mobile is not null
and mobile != ''
<if test="keyword != null and keyword != ''"> <if test="keyword != null and keyword != ''">
and (mobile like CONCAT('%', #{keyword} ,'%') and (mobile like CONCAT('%', #{keyword} ,'%')
or username like CONCAT('%', #{keyword} ,'%')) or username like CONCAT('%', #{keyword} ,'%'))

6
coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java
View File

@@ -5,8 +5,6 @@ import com.cool.store.request.*;
import com.cool.store.vo.*; import com.cool.store.vo.*;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import java.util.List;
/** /**
* @Author suzhuhong * @Author suzhuhong
* @Date 2024/3/25 13:45 * @Date 2024/3/25 13:45
@@ -103,9 +101,9 @@ public interface LineService {
PageInfo<LineVO> getLines(LinesRequest request); PageInfo<LineVO> getLines(LinesRequest request);
/** /**
* 查询已分配招商经理的所有线索 * 查询所有线索
*/ */
PageInfo<LineVO> getLinesAssignInvestManager(LinesRequest request); PageInfo<LineVO> getLinesIncludeMobile(LinesRequest request);
/** /**
* @Auther: wangshuo * @Auther: wangshuo

11
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.cool.store.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants; import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant;
import com.cool.store.context.LoginUserInfo; import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.dao.visit.VisitRecordDAO; import com.cool.store.dao.visit.VisitRecordDAO;
@@ -30,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.MessageFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -648,9 +646,14 @@ public class LineServiceImpl implements LineService {
} }
@Override @Override
public PageInfo<LineVO> getLinesAssignInvestManager(LinesRequest request) { public PageInfo<LineVO> getLinesIncludeMobile(LinesRequest request) {
PageHelper.startPage(request.getPageNum(), request.getPageSize()); PageHelper.startPage(request.getPageNum(), request.getPageSize());
List<LineVO> lines = lineInfoDAO.getLinesAssignInvestManager(request.getKeyword()); List<LineVO> lines = lineInfoDAO.getLinesIncludeMobile(request.getKeyword());
lines.forEach(v -> {
if (StringUtils.isBlank(v.getUsername())) {
v.setUsername("");
}
});
return new PageInfo<>(lines); return new PageInfo<>(lines);
} }

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

@@ -3,7 +3,6 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo; import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.TransferLogDTO; import com.cool.store.dto.TransferLogDTO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.enums.point.PayBusinessTypeEnum; import com.cool.store.enums.point.PayBusinessTypeEnum;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
@@ -20,9 +19,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @Author suzhuhong * @Author suzhuhong
@@ -180,10 +176,10 @@ public class LineInfoController {
return ResponseResult.success(lineService.getLines(request)); return ResponseResult.success(lineService.getLines(request));
} }
@ApiOperation("查询已分配招商经理的所有线索") @ApiOperation("查询所有线索")
@PostMapping("/getLinesAssignInvest") @PostMapping("/getLinesAssignInvest")
public ResponseResult<PageInfo<LineVO>> getLinesAssignInvestManager(@RequestBody LinesRequest request) { public ResponseResult<PageInfo<LineVO>> getLinesAssignInvestManager(@RequestBody LinesRequest request) {
return ResponseResult.success(lineService.getLinesAssignInvestManager(request)); return ResponseResult.success(lineService.getLinesIncludeMobile(request));
} }
@ApiOperation("修改所属大区/分公司") @ApiOperation("修改所属大区/分公司")