huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 17:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRM: 完善回款

Browse Source
This commit is contained in:
puhui999 2024-02-25 02:11:19 +08:00
parent b9ffb7833c
commit e5c3e69f5c
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivablePageReqVO.java
View File

@ -24,6 +24,9 @@ public class CrmReceivablePageReqVO extends PageParam {
@Schema(description = "客户编号", example = "4963") @Schema(description = "客户编号", example = "4963")
private Long customerId; private Long customerId;
@Schema(description = "合同编号", example = "4963")
private Long contractId;
@Schema(description = "场景类型", example = "1") @Schema(description = "场景类型", example = "1")
@InEnum(CrmSceneTypeEnum.class) @InEnum(CrmSceneTypeEnum.class)
private Integer sceneType; // 场景类型，为 null 时则表示全部 private Integer sceneType; // 场景类型，为 null 时则表示全部

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractProductDO.java
View File

@ -46,7 +46,7 @@ public class CrmContractProductDO extends BaseDO {
*/ */
private BigDecimal productPrice; private BigDecimal productPrice;
/** /**
* 合同价格, 单位：分 * 合同价格, 单位：元
*/ */
private BigDecimal contractPrice; private BigDecimal contractPrice;
/** /**

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
View File

@ -28,6 +28,7 @@ public interface CrmReceivableMapper extends BaseMapperX<CrmReceivableDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivableDO>() return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivableDO>()
.eq(CrmReceivableDO::getCustomerId, reqVO.getCustomerId()) // 必须传递 .eq(CrmReceivableDO::getCustomerId, reqVO.getCustomerId()) // 必须传递
.eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo()) .eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(CrmReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId()) .eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId())
.orderByDesc(CrmReceivableDO::getId)); .orderByDesc(CrmReceivableDO::getId));
} }
@ -41,6 +42,7 @@ public interface CrmReceivableMapper extends BaseMapperX<CrmReceivableDO> {
query.selectAll(CrmReceivableDO.class) query.selectAll(CrmReceivableDO.class)
.eqIfPresent(CrmReceivableDO::getNo, pageReqVO.getNo()) .eqIfPresent(CrmReceivableDO::getNo, pageReqVO.getNo())
.eqIfPresent(CrmReceivableDO::getPlanId, pageReqVO.getPlanId()) .eqIfPresent(CrmReceivableDO::getPlanId, pageReqVO.getPlanId())
.eqIfPresent(CrmReceivableDO::getContractId, pageReqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getAuditStatus, pageReqVO.getAuditStatus()) .eqIfPresent(CrmReceivableDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmReceivableDO::getId); .orderByDesc(CrmReceivableDO::getId);
return selectJoinPage(pageReqVO, CrmReceivableDO.class, query); return selectJoinPage(pageReqVO, CrmReceivableDO.class, query);