From 856d52d6fc05b9a028b69883531fcd202e9020eb Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sun, 10 May 2026 15:34:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor(domain):=20=E5=B0=86=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=9E=E4=BD=93=E4=B8=AD=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8EBigDecima?= =?UTF-8?q?l=E6=94=B9=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改ApsPlanDetail实体类中rawThick、rawWidth、coatingG、productWidth、rollingThick、markCoatThick字段为String类型 - 修改ApsPlanDetailBo业务对象类中对应字段类型为String - 修改ApsPlanDetailVo视图对象类中对应字段类型为String - 更新服务实现类中查询条件判断逻辑，使用StringUtils.isNotBlank替代null判断 - 统一所有相关实体类中的数据类型变更，确保数据一致性 --- .../klp/aps/domain/bo/ApsPlanDetailBo.java | 12 +++++----- .../klp/aps/domain/entity/ApsPlanDetail.java | 12 +++++----- .../klp/aps/domain/vo/ApsPlanDetailVo.java | 12 +++++----- .../impl/ApsPlanDetailServiceImpl.java | 24 +++++++++---------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java index 53f882cb..3e90e266 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/bo/ApsPlanDetailBo.java @@ -80,12 +80,12 @@ public class ApsPlanDetailBo extends BaseEntity { /** * 原料信息:厚度mm */ - private BigDecimal rawThick; + private String rawThick; /** * 原料信息:宽度mm */ - private BigDecimal rawWidth; + private String rawWidth; /** * 原料钢卷ID @@ -135,22 +135,22 @@ public class ApsPlanDetailBo extends BaseEntity { /** * 成品信息:镀层g */ - private BigDecimal coatingG; + private String coatingG; /** * 成品信息:成品宽度 */ - private BigDecimal productWidth; + private String productWidth; /** * 成品信息:轧制厚度 */ - private BigDecimal rollingThick; + private String rollingThick; /** * 成品信息:标签厚度 */ - private BigDecimal markCoatThick; + private String markCoatThick; /** * 成品信息:吨钢长度区间m diff --git a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java index 35afb282..a1bd008a 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/entity/ApsPlanDetail.java @@ -67,11 +67,11 @@ public class ApsPlanDetail extends BaseEntity { /** * 原料信息:厚度mm */ - private BigDecimal rawThick; + private String rawThick; /** * 原料信息:宽度mm */ - private BigDecimal rawWidth; + private String rawWidth; /** * 原料钢卷ID */ @@ -111,19 +111,19 @@ public class ApsPlanDetail extends BaseEntity { /** * 成品信息:镀层g */ - private BigDecimal coatingG; + private String coatingG; /** * 成品信息:成品宽度 */ - private BigDecimal productWidth; + private String productWidth; /** * 成品信息:轧制厚度 */ - private BigDecimal rollingThick; + private String rollingThick; /** * 成品信息:标签厚度 */ - private BigDecimal markCoatThick; + private String markCoatThick; /** * 成品信息:吨钢长度区间m */ diff --git a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java index 11cff34c..dac59bae 100644 --- a/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java +++ b/klp-aps/src/main/java/com/klp/aps/domain/vo/ApsPlanDetailVo.java @@ -87,13 +87,13 @@ public class ApsPlanDetailVo { * 原料信息:厚度mm */ @ExcelProperty(value = "原料信息:厚度mm") - private BigDecimal rawThick; + private String rawThick; /** * 原料信息:宽度mm */ @ExcelProperty(value = "原料信息:宽度mm") - private BigDecimal rawWidth; + private String rawWidth; /** * 原料钢卷ID @@ -153,25 +153,25 @@ public class ApsPlanDetailVo { * 成品信息:镀层g */ @ExcelProperty(value = "成品信息:镀层g") - private BigDecimal coatingG; + private String coatingG; /** * 成品信息:成品宽度 */ @ExcelProperty(value = "成品信息:成品宽度") - private BigDecimal productWidth; + private String productWidth; /** * 成品信息:轧制厚度 */ @ExcelProperty(value = "成品信息:轧制厚度") - private BigDecimal rollingThick; + private String rollingThick; /** * 成品信息:标签厚度 */ @ExcelProperty(value = "成品信息:标签厚度") - private BigDecimal markCoatThick; + private String markCoatThick; /** * 成品信息:吨钢长度区间m diff --git a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java index 7496d162..11a8f84f 100644 --- a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java +++ b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java @@ -73,8 +73,8 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService { qw.eq(StringUtils.isNotBlank(bo.getSalesman()), "d.salesman", bo.getSalesman()); qw.eq(StringUtils.isNotBlank(bo.getRawManufacturer()), "d.raw_manufacturer", bo.getRawManufacturer()); qw.eq(StringUtils.isNotBlank(bo.getRawMaterial()), "d.raw_material", bo.getRawMaterial()); - qw.eq(bo.getRawThick() != null, "d.raw_thick", bo.getRawThick()); - qw.eq(bo.getRawWidth() != null, "d.raw_width", bo.getRawWidth()); + qw.eq(StringUtils.isNotBlank(bo.getRawThick()), "d.raw_thick", bo.getRawThick()); + qw.eq(StringUtils.isNotBlank(bo.getRawWidth()), "d.raw_width", bo.getRawWidth()); qw.eq(bo.getRawMaterialId() != null, "d.raw_material_id", bo.getRawMaterialId()); qw.eq(StringUtils.isNotBlank(bo.getRawCoilNos()), "d.raw_coil_nos", bo.getRawCoilNos()); qw.eq(StringUtils.isNotBlank(bo.getRawLocation()), "d.raw_location", bo.getRawLocation()); @@ -84,10 +84,10 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService { qw.eq(bo.getRawNetWeight() != null, "d.raw_net_weight", bo.getRawNetWeight()); qw.like(StringUtils.isNotBlank(bo.getProductName()), "d.product_name", bo.getProductName()); qw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), "d.product_material", bo.getProductMaterial()); - qw.eq(bo.getCoatingG() != null, "d.coating_g", bo.getCoatingG()); - qw.eq(bo.getProductWidth() != null, "d.product_width", bo.getProductWidth()); - qw.eq(bo.getRollingThick() != null, "d.rolling_thick", bo.getRollingThick()); - qw.eq(bo.getMarkCoatThick() != null, "d.mark_coat_thick", bo.getMarkCoatThick()); + qw.eq(StringUtils.isNotBlank(bo.getCoatingG()), "d.coating_g", bo.getCoatingG()); + qw.eq(StringUtils.isNotBlank(bo.getProductWidth()), "d.product_width", bo.getProductWidth()); + qw.eq(StringUtils.isNotBlank(bo.getRollingThick()), "d.rolling_thick", bo.getRollingThick()); + qw.eq(StringUtils.isNotBlank(bo.getMarkCoatThick()), "d.mark_coat_thick", bo.getMarkCoatThick()); qw.eq(StringUtils.isNotBlank(bo.getTonSteelLengthRange()), "d.ton_steel_length_range", bo.getTonSteelLengthRange()); qw.eq(bo.getPlanQty() != null, "d.plan_qty", bo.getPlanQty()); qw.eq(bo.getPlanWeight() != null, "d.plan_weight", bo.getPlanWeight()); @@ -140,8 +140,8 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService { lqw.eq(StringUtils.isNotBlank(bo.getSalesman()), ApsPlanDetail::getSalesman, bo.getSalesman()); lqw.eq(StringUtils.isNotBlank(bo.getRawManufacturer()), ApsPlanDetail::getRawManufacturer, bo.getRawManufacturer()); lqw.eq(StringUtils.isNotBlank(bo.getRawMaterial()), ApsPlanDetail::getRawMaterial, bo.getRawMaterial()); - lqw.eq(bo.getRawThick() != null, ApsPlanDetail::getRawThick, bo.getRawThick()); - lqw.eq(bo.getRawWidth() != null, ApsPlanDetail::getRawWidth, bo.getRawWidth()); + lqw.eq(StringUtils.isNotBlank(bo.getRawThick()), ApsPlanDetail::getRawThick, bo.getRawThick()); + lqw.eq(StringUtils.isNotBlank(bo.getRawWidth()), ApsPlanDetail::getRawWidth, bo.getRawWidth()); lqw.eq(bo.getRawMaterialId() != null, ApsPlanDetail::getRawMaterialId, bo.getRawMaterialId()); lqw.eq(StringUtils.isNotBlank(bo.getRawCoilNos()), ApsPlanDetail::getRawCoilNos, bo.getRawCoilNos()); lqw.eq(StringUtils.isNotBlank(bo.getRawLocation()), ApsPlanDetail::getRawLocation, bo.getRawLocation()); @@ -151,10 +151,10 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService { lqw.eq(bo.getRawNetWeight() != null, ApsPlanDetail::getRawNetWeight, bo.getRawNetWeight()); lqw.like(StringUtils.isNotBlank(bo.getProductName()), ApsPlanDetail::getProductName, bo.getProductName()); lqw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), ApsPlanDetail::getProductMaterial, bo.getProductMaterial()); - lqw.eq(bo.getCoatingG() != null, ApsPlanDetail::getCoatingG, bo.getCoatingG()); - lqw.eq(bo.getProductWidth() != null, ApsPlanDetail::getProductWidth, bo.getProductWidth()); - lqw.eq(bo.getRollingThick() != null, ApsPlanDetail::getRollingThick, bo.getRollingThick()); - lqw.eq(bo.getMarkCoatThick() != null, ApsPlanDetail::getMarkCoatThick, bo.getMarkCoatThick()); + lqw.eq(StringUtils.isNotBlank(bo.getCoatingG()), ApsPlanDetail::getCoatingG, bo.getCoatingG()); + lqw.eq(StringUtils.isNotBlank(bo.getProductWidth()), ApsPlanDetail::getProductWidth, bo.getProductWidth()); + lqw.eq(StringUtils.isNotBlank(bo.getRollingThick()), ApsPlanDetail::getRollingThick, bo.getRollingThick()); + lqw.eq(StringUtils.isNotBlank(bo.getMarkCoatThick()), ApsPlanDetail::getMarkCoatThick, bo.getMarkCoatThick()); lqw.eq(StringUtils.isNotBlank(bo.getTonSteelLengthRange()), ApsPlanDetail::getTonSteelLengthRange, bo.getTonSteelLengthRange()); lqw.eq(bo.getPlanQty() != null, ApsPlanDetail::getPlanQty, bo.getPlanQty()); lqw.eq(bo.getPlanWeight() != null, ApsPlanDetail::getPlanWeight, bo.getPlanWeight());