diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
index f2328b2d..c7e38bbb 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java
@@ -42,6 +42,10 @@ public class CrmContract extends BaseEntity {
* 需方
*/
private String customer;
+ /**
+ * 客户ID
+ */
+ private Long customerId;
/**
* 签订时间
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
index 9983d945..69864d86 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmContractBo.java
@@ -45,6 +45,11 @@ public class CrmContractBo extends BaseEntity {
*/
private String customer;
+ /**
+ * 客户ID
+ */
+ private Long customerId;
+
/**
* 签订时间
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
index 2f3dae2c..f95c4dbd 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractVo.java
@@ -51,6 +51,12 @@ public class CrmContractVo {
@ExcelProperty(value = "需方")
private String customer;
+ /**
+ * 客户ID
+ */
+ @ExcelProperty(value = "客户ID")
+ private Long customerId;
+
/**
* 签订时间
*/
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
index 81b8827d..3f2115ef 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmContractServiceImpl.java
@@ -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());
diff --git a/klp-crm/src/main/resources/mapper/CrmContractMapper.xml b/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
index b44d91b2..94629242 100644
--- a/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmContractMapper.xml
@@ -10,6 +10,7 @@
+