From 99b04de630bd3adcb3a3d9f7e46fc39a777b1839 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 30 Apr 2026 15:21:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(crm):=20=E4=BF=AE=E6=94=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B9=E7=9B=AE=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B9=B6=E6=96=B0=E5=A2=9E=E8=A1=A8=E9=9D=A2?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将宽度公差、厚度公差字段从 BigDecimal 类型改为 String 类型
- 将宽度、厚度字段从 BigDecimal 类型改为 String 类型
- 新增表面质量(surfaceQuality)字段及相应 getter/setter 方法
- 更新数据库映射文件添加表面质量字段映射
- 修改查询条件构建逻辑适配字符串类型字段判空
- 更新 Excel 导入导出配置适配新的数据类型
---
 .../main/java/com/klp/crm/domain/CrmOrderItem.java | 12 ++++++++----
 .../java/com/klp/crm/domain/bo/CrmOrderItemBo.java | 13 +++++++++----
 .../java/com/klp/crm/domain/vo/CrmOrderItemVo.java | 14 ++++++++++----
 .../crm/service/impl/CrmOrderItemServiceImpl.java  |  9 +++++----
 .../main/resources/mapper/CrmOrderItemMapper.xml   |  4 +++-
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
index 886336f4..8429d599 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
@@ -72,11 +72,15 @@ public class CrmOrderItem extends BaseEntity {
     /**
      * 宽度公差
      */
-    private BigDecimal widthTolerance;
+    private String widthTolerance;
     /**
      * 厚度公差
      */
-    private BigDecimal thicknessTolerance;
+    private String thicknessTolerance;
+    /**
+     * 表面质量
+     */
+    private String surfaceQuality;
     /**
      * 合同定价
      */
@@ -108,11 +112,11 @@ public class CrmOrderItem extends BaseEntity {
     /**
      * 宽度
      */
-    private BigDecimal width;
+    private String width;
     /**
      * 厚度
      */
-    private BigDecimal thickness;
+    private String thickness;
     /**
      * 用途
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
index 1aabe0a8..10bca66f 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
@@ -81,12 +81,17 @@ public class CrmOrderItemBo extends BaseEntity {
     /**
      * 宽度公差
      */
-    private BigDecimal widthTolerance;
+    private String widthTolerance;
 
     /**
      * 厚度公差
      */
-    private BigDecimal thicknessTolerance;
+    private String thicknessTolerance;
+
+    /**
+     * 表面质量
+     */
+    private String surfaceQuality;
 
     /**
      * 合同定价
@@ -126,12 +131,12 @@ public class CrmOrderItemBo extends BaseEntity {
     /**
      * 宽度
      */
-    private BigDecimal width;
+    private String width;
 
     /**
      * 厚度
      */
-    private BigDecimal thickness;
+    private String thickness;
 
     /**
      * 用途
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
index 5692b149..c4ba476b 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
@@ -99,13 +99,19 @@ public class CrmOrderItemVo {
      * 宽度公差
      */
     @ExcelProperty(value = "宽度公差")
-    private BigDecimal widthTolerance;
+    private String widthTolerance;
 
     /**
      * 厚度公差
      */
     @ExcelProperty(value = "厚度公差")
-    private BigDecimal thicknessTolerance;
+    private String thicknessTolerance;
+
+    /**
+     * 表面质量
+     */
+    @ExcelProperty(value = "表面质量")
+    private String surfaceQuality;
 
     /**
      * 合同定价
@@ -153,13 +159,13 @@ public class CrmOrderItemVo {
      * 宽度
      */
     @ExcelProperty(value = "宽度")
-    private BigDecimal width;
+    private String width;
 
     /**
      * 厚度
      */
     @ExcelProperty(value = "厚度")
-    private BigDecimal thickness;
+    private String thickness;
 
     /**
      * 用途
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
index 95fee509..206c4dac 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
@@ -95,17 +95,18 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
         lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), CrmOrderItem::getMaterial, bo.getMaterial());
         lqw.eq(StringUtils.isNotBlank(bo.getGrade()), CrmOrderItem::getGrade, bo.getGrade());
         lqw.eq(bo.getWeight() != null, CrmOrderItem::getWeight, bo.getWeight());
-        lqw.eq(bo.getWidthTolerance() != null, CrmOrderItem::getWidthTolerance, bo.getWidthTolerance());
-        lqw.eq(bo.getThicknessTolerance() != null, CrmOrderItem::getThicknessTolerance, bo.getThicknessTolerance());
+        lqw.eq(StringUtils.isNotBlank(bo.getWidthTolerance()), CrmOrderItem::getWidthTolerance, bo.getWidthTolerance());
+        lqw.eq(StringUtils.isNotBlank(bo.getThicknessTolerance()), CrmOrderItem::getThicknessTolerance, bo.getThicknessTolerance());
         lqw.eq(bo.getContractPrice() != null, CrmOrderItem::getContractPrice, bo.getContractPrice());
         lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
         lqw.eq(StringUtils.isNotBlank(bo.getShipper()), CrmOrderItem::getShipper, bo.getShipper());
         lqw.eq(StringUtils.isNotBlank(bo.getProductionBatch()), CrmOrderItem::getProductionBatch, bo.getProductionBatch());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), CrmOrderItem::getSurfaceTreatment, bo.getSurfaceTreatment());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), CrmOrderItem::getSurfaceQuality, bo.getSurfaceQuality());
         lqw.eq(StringUtils.isNotBlank(bo.getEdgeCuttingReq()), CrmOrderItem::getEdgeCuttingReq, bo.getEdgeCuttingReq());
         lqw.eq(StringUtils.isNotBlank(bo.getPackagingReq()), CrmOrderItem::getPackagingReq, bo.getPackagingReq());
-        lqw.eq(bo.getWidth() != null, CrmOrderItem::getWidth, bo.getWidth());
-        lqw.eq(bo.getThickness() != null, CrmOrderItem::getThickness, bo.getThickness());
+        lqw.eq(StringUtils.isNotBlank(bo.getWidth()), CrmOrderItem::getWidth, bo.getWidth());
+        lqw.eq(StringUtils.isNotBlank(bo.getThickness()), CrmOrderItem::getThickness, bo.getThickness());
         lqw.eq(StringUtils.isNotBlank(bo.getPurpose()), CrmOrderItem::getPurpose, bo.getPurpose());
         return lqw;
     }
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
index 5cbed499..1df4a74b 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="shipper" column="shipper"/>
         <result property="productionBatch" column="production_batch"/>
         <result property="surfaceTreatment" column="surface_treatment"/>
+        <result property="surfaceQuality" column="surface_quality"/>
         <result property="edgeCuttingReq" column="edge_cutting_req"/>
         <result property="packagingReq" column="packaging_req"/>
         <result property="width" column="width"/>
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         shipper,
         production_batch,
         surface_treatment,
+        surface_quality,
         edge_cutting_req,
         packaging_req,
         width,
@@ -77,4 +79,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>