refactor(domain): 将计划详情实体中的数值字段类型从BigDecimal改为String
- 修改ApsPlanDetail实体类中rawThick、rawWidth、coatingG、productWidth、rollingThick、markCoatThick字段为String类型 - 修改ApsPlanDetailBo业务对象类中对应字段类型为String - 修改ApsPlanDetailVo视图对象类中对应字段类型为String - 更新服务实现类中查询条件判断逻辑,使用StringUtils.isNotBlank替代null判断 - 统一所有相关实体类中的数据类型变更,确保数据一致性
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user