Commit 1ba2b7b60086373cf1700d24455797fda65db49a

Authored by dhb52
1 parent cd1e73cc

fix: Customer,Clue增加followUpStatus自动查询

yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
... ... @@ -39,4 +39,7 @@ public class CrmCluePageReqVO extends PageParam {
39 39 @Schema(description = "客户来源", example = "1")
40 40 private Integer source;
41 41  
  42 + @Schema(description = "跟进状态", example = "true")
  43 + private Boolean followUpStatus;
  44 +
42 45 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerPageReqVO.java
... ... @@ -55,4 +55,7 @@ public class CrmCustomerPageReqVO extends PageParam {
55 55 @Schema(description = "跟进状态", example = "true")
56 56 private Boolean followUpStatus; // backlog查询条件, null 则表示为不做查询
57 57  
  58 + @Schema(description = "跟进状态", example = "true")
  59 + private Boolean followUpStatus;
  60 +
58 61 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/CrmClueMapper.java
... ... @@ -41,6 +41,7 @@ public interface CrmClueMapper extends BaseMapperX<CrmClueDO> {
41 41 .eqIfPresent(CrmClueDO::getIndustryId, pageReqVO.getIndustryId())
42 42 .eqIfPresent(CrmClueDO::getLevel, pageReqVO.getLevel())
43 43 .eqIfPresent(CrmClueDO::getSource, pageReqVO.getSource())
  44 + .eqIfPresent(CrmClueDO::getFollowUpStatus, pageReqVO.getFollowUpStatus())
44 45 .orderByDesc(CrmClueDO::getId);
45 46 return selectJoinPage(pageReqVO, CrmClueDO.class, query);
46 47 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
8 8 import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.CrmContractPageReqVO;
  9 +import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
9 10 import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
10 11 import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
11 12 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
... ... @@ -94,7 +94,8 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
94 94 .eqIfPresent(CrmCustomerDO::getMobile, pageReqVO.getMobile())
95 95 .eqIfPresent(CrmCustomerDO::getIndustryId, pageReqVO.getIndustryId())
96 96 .eqIfPresent(CrmCustomerDO::getLevel, pageReqVO.getLevel())
97   - .eqIfPresent(CrmCustomerDO::getSource, pageReqVO.getSource());
  97 + .eqIfPresent(CrmCustomerDO::getSource, pageReqVO.getSource())
  98 + .eqIfPresent(CrmCustomerDO::getFollowUpStatus, pageReqVO.getFollowUpStatus());
98 99  
99 100 // backlog 查询
100 101 if (ObjUtil.isNotNull(pageReqVO.getContactStatus())) {
... ...