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"
+
+
+
+