feat(crm): 添加合同实体中的客户ID字段支持
- 在CrmContract实体类中新增customerId字段 - 在CrmContractBo业务对象中添加customerId属性 - 更新CrmContractMapper.xml映射文件加入customer_id结果映射 - 在查询条件中增加customerId过滤逻辑 - 为CrmContractVo视图对象添加customerId字段并配置Excel导出
This commit is contained in:
@@ -42,6 +42,10 @@ public class CrmContract extends BaseEntity {
|
||||
* 需方
|
||||
*/
|
||||
private String customer;
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
private Long customerId;
|
||||
/**
|
||||
* 签订时间
|
||||
*/
|
||||
|
||||
@@ -45,6 +45,11 @@ public class CrmContractBo extends BaseEntity {
|
||||
*/
|
||||
private String customer;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
private Long customerId;
|
||||
|
||||
/**
|
||||
* 签订时间
|
||||
*/
|
||||
|
||||
@@ -51,6 +51,12 @@ public class CrmContractVo {
|
||||
@ExcelProperty(value = "需方")
|
||||
private String customer;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
@ExcelProperty(value = "客户ID")
|
||||
private Long customerId;
|
||||
|
||||
/**
|
||||
* 签订时间
|
||||
*/
|
||||
|
||||
@@ -65,6 +65,7 @@ public class CrmContractServiceImpl implements ICrmContractService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getContractNo()), CrmContract::getContractNo, bo.getContractNo());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSupplier()), CrmContract::getSupplier, bo.getSupplier());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCustomer()), CrmContract::getCustomer, bo.getCustomer());
|
||||
lqw.eq(bo.getCustomerId() != null, CrmContract::getCustomerId, bo.getCustomerId());
|
||||
lqw.eq(bo.getSignTime() != null, CrmContract::getSignTime, bo.getSignTime());
|
||||
lqw.eq(bo.getDeliveryDate() != null, CrmContract::getDeliveryDate, bo.getDeliveryDate());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSignLocation()), CrmContract::getSignLocation, bo.getSignLocation());
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
<result property="contractNo" column="contract_no"/>
|
||||
<result property="supplier" column="supplier"/>
|
||||
<result property="customer" column="customer"/>
|
||||
<result property="customerId" column="customer_id"/>
|
||||
<result property="deliveryDate" column="delivery_date"/>
|
||||
<result property="signTime" column="sign_time"/>
|
||||
<result property="signLocation" column="sign_location"/>
|
||||
|
||||
Reference in New Issue
Block a user