From 6bd5d2ded37e629ac71e79f611119428de80bbdd Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 17 Apr 2026 14:16:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(CrmOrderItem):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B9=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在CrmOrderItem实体类中新增表面处理、切边要求、包装要求、宽度、厚度、用途字段
- 在CrmOrderItemBo业务对象中同步添加对应字段定义
- 在CrmOrderItemVo视图对象中添加Excel导出注解配置
- 更新MyBatis映射文件中的结果映射和插入字段列表
- 在查询条件构建器中添加新字段的查询支持
---
.../java/com/klp/crm/domain/CrmOrderItem.java | 24 +++++++++++++
.../com/klp/crm/domain/bo/CrmOrderItemBo.java | 29 +++++++++++++++
.../com/klp/crm/domain/vo/CrmOrderItemVo.java | 35 +++++++++++++++++++
.../service/impl/CrmOrderItemServiceImpl.java | 6 ++++
.../resources/mapper/CrmOrderItemMapper.xml | 12 +++++++
5 files changed, 106 insertions(+)
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 132a83dd..886336f4 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
@@ -93,6 +93,30 @@ public class CrmOrderItem extends BaseEntity {
* 排产批次
*/
private String productionBatch;
+ /**
+ * 表面处理
+ */
+ private String surfaceTreatment;
+ /**
+ * 切边要求
+ */
+ private String edgeCuttingReq;
+ /**
+ * 包装要求
+ */
+ private String packagingReq;
+ /**
+ * 宽度
+ */
+ private BigDecimal width;
+ /**
+ * 厚度
+ */
+ private BigDecimal thickness;
+ /**
+ * 用途
+ */
+ private String purpose;
/**
* 删除标识 0正常 2删除
*/
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 49896a75..1aabe0a8 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
@@ -108,5 +108,34 @@ public class CrmOrderItemBo extends BaseEntity {
*/
private String productionBatch;
+ /**
+ * 表面处理
+ */
+ private String surfaceTreatment;
+
+ /**
+ * 切边要求
+ */
+ private String edgeCuttingReq;
+
+ /**
+ * 包装要求
+ */
+ private String packagingReq;
+
+ /**
+ * 宽度
+ */
+ private BigDecimal width;
+
+ /**
+ * 厚度
+ */
+ private BigDecimal thickness;
+
+ /**
+ * 用途
+ */
+ private String purpose;
}
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 07b05e32..5692b149 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
@@ -131,5 +131,40 @@ public class CrmOrderItemVo {
@ExcelProperty(value = "排产批次")
private String productionBatch;
+ /**
+ * 表面处理
+ */
+ @ExcelProperty(value = "表面处理")
+ private String surfaceTreatment;
+
+ /**
+ * 切边要求
+ */
+ @ExcelProperty(value = "切边要求")
+ private String edgeCuttingReq;
+
+ /**
+ * 包装要求
+ */
+ @ExcelProperty(value = "包装要求")
+ private String packagingReq;
+
+ /**
+ * 宽度
+ */
+ @ExcelProperty(value = "宽度")
+ private BigDecimal width;
+
+ /**
+ * 厚度
+ */
+ @ExcelProperty(value = "厚度")
+ private BigDecimal thickness;
+
+ /**
+ * 用途
+ */
+ @ExcelProperty(value = "用途")
+ private String purpose;
}
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 24121b16..95fee509 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
@@ -101,6 +101,12 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
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.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.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 dfeb51b2..5cbed499 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
@@ -23,6 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
@@ -50,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
customizer,
shipper,
production_batch,
+ surface_treatment,
+ edge_cutting_req,
+ packaging_req,
+ width,
+ thickness,
+ purpose,
create_by,
create_time,
update_by,