From 476c403ab6d0b4c5252ca90f1fb9eceb5af33dc6 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 9 May 2026 17:06:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=BC=82=E8=AE=AE=E7=AE=A1=E7=90=86=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CrmSalesObjection实体类中新增产品类别、返回日期、投诉情况、客户诉求四个字段
- 在CrmSalesObjectionBo业务对象中同步添加对应字段定义
- 在CrmSalesObjectionVo视图对象中添加字段并配置Excel导出注解
- 更新MyBatis映射文件添加数据库字段映射关系
- 在查询条件构建中增加对新增字段的查询支持
---
 .../com/klp/crm/domain/CrmSalesObjection.java | 21 ++++++++++++++++
 .../crm/domain/bo/CrmSalesObjectionBo.java    | 20 ++++++++++++++++
 .../crm/domain/vo/CrmSalesObjectionVo.java    | 24 +++++++++++++++++++
 .../impl/CrmSalesObjectionServiceImpl.java    |  4 ++++
 .../mapper/CrmSalesObjectionMapper.xml        |  4 ++++
 5 files changed, 73 insertions(+)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java
index 37056a70..fd3d2241 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmSalesObjection.java
@@ -70,6 +70,27 @@ public class CrmSalesObjection extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 产品类别
+     */
+    private String productCategory;
+
+    /**
+     * 返回日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnDate;
+
+    /**
+     * 投诉情况
+     */
+    private String complaintContent;
+
+    /**
+     * 客户诉求
+     */
+    private String customerDemand;
+
     /**
      * 删除标识 0正常 2删除
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java
index 0bd027c0..4a6714e6 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmSalesObjectionBo.java
@@ -79,5 +79,25 @@ public class CrmSalesObjectionBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 产品类别
+     */
+    private String productCategory;
+
+    /**
+     * 返回日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnDate;
+
+    /**
+     * 投诉情况
+     */
+    private String complaintContent;
+
+    /**
+     * 客户诉求
+     */
+    private String customerDemand;
 
 }
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java
index 9ebf0f7f..96a08cca 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmSalesObjectionVo.java
@@ -97,5 +97,29 @@ public class CrmSalesObjectionVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 产品类别
+     */
+    @ExcelProperty(value = "产品类别")
+    private String productCategory;
+
+    /**
+     * 返回日期
+     */
+    @ExcelProperty(value = "返回日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnDate;
+
+    /**
+     * 投诉情况
+     */
+    @ExcelProperty(value = "投诉情况")
+    private String complaintContent;
+
+    /**
+     * 客户诉求
+     */
+    @ExcelProperty(value = "客户诉求")
+    private String customerDemand;
 
 }
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java
index d2589a0b..4cc7de78 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesObjectionServiceImpl.java
@@ -71,6 +71,10 @@ public class CrmSalesObjectionServiceImpl implements ICrmSalesObjectionService {
         lqw.eq(StringUtils.isNotBlank(bo.getHandleUser()), CrmSalesObjection::getHandleUser, bo.getHandleUser());
         lqw.eq(bo.getHandleTime() != null, CrmSalesObjection::getHandleTime, bo.getHandleTime());
         lqw.eq(bo.getCloseTime() != null, CrmSalesObjection::getCloseTime, bo.getCloseTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductCategory()), CrmSalesObjection::getProductCategory, bo.getProductCategory());
+        lqw.eq(bo.getReturnDate() != null, CrmSalesObjection::getReturnDate, bo.getReturnDate());
+        lqw.like(StringUtils.isNotBlank(bo.getComplaintContent()), CrmSalesObjection::getComplaintContent, bo.getComplaintContent());
+        lqw.like(StringUtils.isNotBlank(bo.getCustomerDemand()), CrmSalesObjection::getCustomerDemand, bo.getCustomerDemand());
         return lqw;
     }
 
diff --git a/klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml b/klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml
index 2c6f6500..a330c626 100644
--- a/klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmSalesObjectionMapper.xml
@@ -17,6 +17,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="handleTime" column="handle_time"/>
         <result property="closeTime" column="close_time"/>
         <result property="remark" column="remark"/>
+        <result property="productCategory" column="product_category"/>
+        <result property="returnDate" column="return_date"/>
+        <result property="complaintContent" column="complaint_content"/>
+        <result property="customerDemand" column="customer_demand"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>