From 9559e5810e4623d956ce4b0c74ba32835e06792b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 13 Jun 2026 14:34:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(domain):=20=E9=87=8D=E6=9E=84=E6=8B=89?= =?UTF-8?q?=E4=BC=B8=E6=A3=80=E9=AA=8C=E7=BB=86=E8=8A=82=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=9A=84=E5=BC=AF=E6=9B=B2=E8=AF=95=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 bendTest90 字段重命名为 bendTest,统一弯曲试验结果字段 - 将 bendTest180 字段重命名为 bendTestReverse,明确表示反向弯曲试验 - 更新数据库映射文件中的字段映射关系 - 修改服务层查询条件中对应的字段引用 - 更新 Excel 导出注解中的字段描述和值映射 --- .../com/klp/domain/WmsInspectionTensileDetail.java | 8 ++++---- .../klp/domain/bo/WmsInspectionTensileDetailBo.java | 8 ++++---- .../klp/domain/vo/WmsInspectionTensileDetailVo.java | 12 ++++++------ .../impl/WmsInspectionTensileDetailServiceImpl.java | 4 ++-- .../mapper/klp/WmsInspectionTensileDetailMapper.xml | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java index 6c25a282..39851902 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsInspectionTensileDetail.java @@ -128,13 +128,13 @@ public class WmsInspectionTensileDetail extends BaseEntity { */ private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - private String bendTest90; + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - private String bendTest180; + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java index 3584fdb0..ffce19e1 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java @@ -175,14 +175,14 @@ public class WmsInspectionTensileDetailBo extends BaseEntity { private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - private String bendTest90; + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - private String bendTest180; + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java index 01217839..7dd60112 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsInspectionTensileDetailVo.java @@ -182,16 +182,16 @@ public class WmsInspectionTensileDetailVo { private BigDecimal roughness; /** - * 弯曲试验 90° 结果 + * 弯曲试验 结果 */ - @ExcelProperty(value = "弯曲试验 90° 结果") - private String bendTest90; + @ExcelProperty(value = "弯曲试验 结果") + private String bendTest; /** - * 弯曲试验 180° 结果 + * 弯曲试验 反向弯曲 结果 */ - @ExcelProperty(value = "弯曲试验 180° 结果") - private String bendTest180; + @ExcelProperty(value = "弯曲试验 反向弯曲 结果") + private String bendTestReverse; /** * 弯曲试验 方向(横向/纵向) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java index 417a0466..b10281de 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java @@ -90,8 +90,8 @@ public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTens lqw.eq(bo.getCoatingWeightBottom() != null, WmsInspectionTensileDetail::getCoatingWeightBottom, bo.getCoatingWeightBottom()); lqw.eq(bo.getCoatingWeightAvg() != null, WmsInspectionTensileDetail::getCoatingWeightAvg, bo.getCoatingWeightAvg()); lqw.eq(bo.getRoughness() != null, WmsInspectionTensileDetail::getRoughness, bo.getRoughness()); - lqw.eq(StringUtils.isNotBlank(bo.getBendTest90()), WmsInspectionTensileDetail::getBendTest90, bo.getBendTest90()); - lqw.eq(StringUtils.isNotBlank(bo.getBendTest180()), WmsInspectionTensileDetail::getBendTest180, bo.getBendTest180()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTest()), WmsInspectionTensileDetail::getBendTest, bo.getBendTest()); + lqw.eq(StringUtils.isNotBlank(bo.getBendTestReverse()), WmsInspectionTensileDetail::getBendTestReverse, bo.getBendTestReverse()); lqw.eq(StringUtils.isNotBlank(bo.getBendTestDirection()), WmsInspectionTensileDetail::getBendTestDirection, bo.getBendTestDirection()); lqw.eq(bo.getCuppingValue() != null, WmsInspectionTensileDetail::getCuppingValue, bo.getCuppingValue()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), WmsInspectionTensileDetail::getSurfaceStructure, bo.getSurfaceStructure()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml index 5c6b2807..57c827af 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsInspectionTensileDetailMapper.xml @@ -31,8 +31,8 @@ - - + +