From 031d7ba708fdd35d5b576a22b3502e642e338d04 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 6 Apr 2026 10:43:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=AE=9E=E4=BD=93=E4=B8=AD=E7=9A=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?ID=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CrmContract实体类中新增customerId字段
- 在CrmContractBo业务对象中添加customerId属性
- 更新CrmContractMapper.xml映射文件加入customer_id结果映射
- 在查询条件中增加customerId过滤逻辑
- 为CrmContractVo视图对象添加customerId字段并配置Excel导出
---
 klp-crm/src/main/java/com/klp/crm/domain/CrmContract.java   | 4 ++++
 .../src/main/java/com/klp/crm/domain/bo/CrmContractBo.java  | 5 +++++
 .../src/main/java/com/klp/crm/domain/vo/CrmContractVo.java  | 6 ++++++
 .../com/klp/crm/service/impl/CrmContractServiceImpl.java    | 1 +
 klp-crm/src/main/resources/mapper/CrmContractMapper.xml     | 1 +
 5 files changed, 17 insertions(+)

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 @@
         <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"/>