feat(qc): 添加化学成分和物理性能检测字段
- 在QcChemicalItem实体类中新增铝、钛、铬、镍、铜、氮、铁、硼等化学成分字段 - 在QcChemicalItemBo业务对象中同步添加对应的化学成分属性 - 更新QcChemicalItemMapper.xml映射文件以支持新字段的数据映射 - 在QcChemicalItemServiceImpl服务实现中添加新字段的查询条件支持 - 在QcChemicalItemVo视图对象中添加化学成分字段并配置Excel导出 - 在QcPhysicalItem实体类中新增规定塑性延伸强度、镀层表面结构、镀层重量等物理性能字段 - 在QcPhysicalItemBo业务对象中添加对应的物理性能属性 - 更新QcPhysicalItemMapper.xml映射文件以支持新的物理性能字段映射 - 在QcPhysicalItemServiceImpl服务实现中添加新物理性能字段的查询条件支持 - 在QcPhysicalItemVo视图对象中添加物理性能字段并配置Excel导出功能
This commit is contained in:
@@ -65,6 +65,38 @@ public class QcChemicalItem extends BaseEntity {
|
||||
* 酸溶铝(%)
|
||||
*/
|
||||
private BigDecimal als;
|
||||
/**
|
||||
* 铝(%)
|
||||
*/
|
||||
private BigDecimal al;
|
||||
/**
|
||||
* 钛(%)
|
||||
*/
|
||||
private BigDecimal ti;
|
||||
/**
|
||||
* 铬(%)
|
||||
*/
|
||||
private BigDecimal cr;
|
||||
/**
|
||||
* 镍(%)
|
||||
*/
|
||||
private BigDecimal ni;
|
||||
/**
|
||||
* 铜(%)
|
||||
*/
|
||||
private BigDecimal cu;
|
||||
/**
|
||||
* 氮(%)
|
||||
*/
|
||||
private BigDecimal n;
|
||||
/**
|
||||
* 铁(%)
|
||||
*/
|
||||
private BigDecimal fe;
|
||||
/**
|
||||
* 硼(%)
|
||||
*/
|
||||
private BigDecimal b;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
@@ -41,6 +41,10 @@ public class QcPhysicalItem extends BaseEntity {
|
||||
* 拉伸试验-屈服强度(MPa)
|
||||
*/
|
||||
private BigDecimal yieldStrength;
|
||||
/**
|
||||
* 规定塑性延伸强度(MPa)
|
||||
*/
|
||||
private BigDecimal plasticExtensionStrength;
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
@@ -65,6 +69,14 @@ public class QcPhysicalItem extends BaseEntity {
|
||||
* 表面结构
|
||||
*/
|
||||
private String surfaceStructure;
|
||||
/**
|
||||
* 镀层表面结构
|
||||
*/
|
||||
private String coatingSurfaceStructure;
|
||||
/**
|
||||
* 镀层重量 COATING MASS(g/m²)
|
||||
*/
|
||||
private BigDecimal coatingMass;
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
|
||||
@@ -73,6 +73,46 @@ public class QcChemicalItemBo extends BaseEntity {
|
||||
*/
|
||||
private BigDecimal als;
|
||||
|
||||
/**
|
||||
* 铝(%)
|
||||
*/
|
||||
private BigDecimal al;
|
||||
|
||||
/**
|
||||
* 钛(%)
|
||||
*/
|
||||
private BigDecimal ti;
|
||||
|
||||
/**
|
||||
* 铬(%)
|
||||
*/
|
||||
private BigDecimal cr;
|
||||
|
||||
/**
|
||||
* 镍(%)
|
||||
*/
|
||||
private BigDecimal ni;
|
||||
|
||||
/**
|
||||
* 铜(%)
|
||||
*/
|
||||
private BigDecimal cu;
|
||||
|
||||
/**
|
||||
* 氮(%)
|
||||
*/
|
||||
private BigDecimal n;
|
||||
|
||||
/**
|
||||
* 铁(%)
|
||||
*/
|
||||
private BigDecimal fe;
|
||||
|
||||
/**
|
||||
* 硼(%)
|
||||
*/
|
||||
private BigDecimal b;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
@@ -43,6 +43,11 @@ public class QcPhysicalItemBo extends BaseEntity {
|
||||
*/
|
||||
private BigDecimal yieldStrength;
|
||||
|
||||
/**
|
||||
* 规定塑性延伸强度(MPa)
|
||||
*/
|
||||
private BigDecimal plasticExtensionStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
@@ -73,6 +78,16 @@ public class QcPhysicalItemBo extends BaseEntity {
|
||||
*/
|
||||
private String surfaceStructure;
|
||||
|
||||
/**
|
||||
* 镀层表面结构
|
||||
*/
|
||||
private String coatingSurfaceStructure;
|
||||
|
||||
/**
|
||||
* 镀层重量 COATING MASS(g/m²)
|
||||
*/
|
||||
private BigDecimal coatingMass;
|
||||
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
|
||||
@@ -86,6 +86,54 @@ public class QcChemicalItemVo {
|
||||
@ExcelProperty(value = "酸溶铝(%)")
|
||||
private BigDecimal als;
|
||||
|
||||
/**
|
||||
* 铝(%)
|
||||
*/
|
||||
@ExcelProperty(value = "铝(%)")
|
||||
private BigDecimal al;
|
||||
|
||||
/**
|
||||
* 钛(%)
|
||||
*/
|
||||
@ExcelProperty(value = "钛(%)")
|
||||
private BigDecimal ti;
|
||||
|
||||
/**
|
||||
* 铬(%)
|
||||
*/
|
||||
@ExcelProperty(value = "铬(%)")
|
||||
private BigDecimal cr;
|
||||
|
||||
/**
|
||||
* 镍(%)
|
||||
*/
|
||||
@ExcelProperty(value = "镍(%)")
|
||||
private BigDecimal ni;
|
||||
|
||||
/**
|
||||
* 铜(%)
|
||||
*/
|
||||
@ExcelProperty(value = "铜(%)")
|
||||
private BigDecimal cu;
|
||||
|
||||
/**
|
||||
* 氮(%)
|
||||
*/
|
||||
@ExcelProperty(value = "氮(%)")
|
||||
private BigDecimal n;
|
||||
|
||||
/**
|
||||
* 铁(%)
|
||||
*/
|
||||
@ExcelProperty(value = "铁(%)")
|
||||
private BigDecimal fe;
|
||||
|
||||
/**
|
||||
* 硼(%)
|
||||
*/
|
||||
@ExcelProperty(value = "硼(%)")
|
||||
private BigDecimal b;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
@@ -51,6 +51,12 @@ public class QcPhysicalItemVo {
|
||||
@ExcelProperty(value = "拉伸试验-屈服强度(MPa)")
|
||||
private BigDecimal yieldStrength;
|
||||
|
||||
/**
|
||||
* 规定塑性延伸强度(MPa)
|
||||
*/
|
||||
@ExcelProperty(value = "规定塑性延伸强度(MPa)")
|
||||
private BigDecimal plasticExtensionStrength;
|
||||
|
||||
/**
|
||||
* 拉伸试验-抗拉强度(MPa)
|
||||
*/
|
||||
@@ -87,6 +93,18 @@ public class QcPhysicalItemVo {
|
||||
@ExcelProperty(value = "表面结构")
|
||||
private String surfaceStructure;
|
||||
|
||||
/**
|
||||
* 镀层表面结构
|
||||
*/
|
||||
@ExcelProperty(value = "镀层表面结构")
|
||||
private String coatingSurfaceStructure;
|
||||
|
||||
/**
|
||||
* 镀层重量 COATING MASS(g/m²)
|
||||
*/
|
||||
@ExcelProperty(value = "镀层重量 COATING MASS(g/m²)")
|
||||
private BigDecimal coatingMass;
|
||||
|
||||
/**
|
||||
* 边缘状态
|
||||
*/
|
||||
|
||||
@@ -79,6 +79,14 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService {
|
||||
lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP());
|
||||
lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS());
|
||||
lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls());
|
||||
lqw.eq(bo.getAl() != null, QcChemicalItem::getAl, bo.getAl());
|
||||
lqw.eq(bo.getTi() != null, QcChemicalItem::getTi, bo.getTi());
|
||||
lqw.eq(bo.getCr() != null, QcChemicalItem::getCr, bo.getCr());
|
||||
lqw.eq(bo.getNi() != null, QcChemicalItem::getNi, bo.getNi());
|
||||
lqw.eq(bo.getCu() != null, QcChemicalItem::getCu, bo.getCu());
|
||||
lqw.eq(bo.getN() != null, QcChemicalItem::getN, bo.getN());
|
||||
lqw.eq(bo.getFe() != null, QcChemicalItem::getFe, bo.getFe());
|
||||
lqw.eq(bo.getB() != null, QcChemicalItem::getB, bo.getB());
|
||||
// 根据创建时间倒叙
|
||||
lqw.orderByDesc(QcChemicalItem::getCreateTime);
|
||||
return lqw;
|
||||
|
||||
@@ -73,12 +73,15 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService {
|
||||
lqw.eq(bo.getCoilId() != null, QcPhysicalItem::getCoilId, bo.getCoilId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcPhysicalItem::getCoilNo, bo.getCoilNo());
|
||||
lqw.eq(bo.getYieldStrength() != null, QcPhysicalItem::getYieldStrength, bo.getYieldStrength());
|
||||
lqw.eq(bo.getPlasticExtensionStrength() != null, QcPhysicalItem::getPlasticExtensionStrength, bo.getPlasticExtensionStrength());
|
||||
lqw.eq(bo.getTensileStrength() != null, QcPhysicalItem::getTensileStrength, bo.getTensileStrength());
|
||||
lqw.eq(bo.getElongation() != null, QcPhysicalItem::getElongation, bo.getElongation());
|
||||
lqw.eq(bo.getHardness() != null, QcPhysicalItem::getHardness, bo.getHardness());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcPhysicalItem::getBendingTest, bo.getBendingTest());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getCoatingSurfaceStructure()), QcPhysicalItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure());
|
||||
lqw.eq(bo.getCoatingMass() != null, QcPhysicalItem::getCoatingMass, bo.getCoatingMass());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus());
|
||||
// 根据创建时间倒叙
|
||||
lqw.orderByDesc(QcPhysicalItem::getCreateTime);
|
||||
|
||||
@@ -16,6 +16,14 @@
|
||||
<result property="p" column="p"/>
|
||||
<result property="s" column="s"/>
|
||||
<result property="als" column="als"/>
|
||||
<result property="al" column="al"/>
|
||||
<result property="ti" column="ti"/>
|
||||
<result property="cr" column="cr"/>
|
||||
<result property="ni" column="ni"/>
|
||||
<result property="cu" column="cu"/>
|
||||
<result property="n" column="n"/>
|
||||
<result property="fe" column="fe"/>
|
||||
<result property="b" column="b"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
|
||||
@@ -10,12 +10,15 @@
|
||||
<result property="coilId" column="coil_id"/>
|
||||
<result property="coilNo" column="coil_no"/>
|
||||
<result property="yieldStrength" column="yield_strength"/>
|
||||
<result property="plasticExtensionStrength" column="plastic_extension_strength"/>
|
||||
<result property="tensileStrength" column="tensile_strength"/>
|
||||
<result property="elongation" column="elongation"/>
|
||||
<result property="hardness" column="hardness"/>
|
||||
<result property="bendingTest" column="bending_test"/>
|
||||
<result property="surfaceQuality" column="surface_quality"/>
|
||||
<result property="surfaceStructure" column="surface_structure"/>
|
||||
<result property="coatingSurfaceStructure" column="coating_surface_structure"/>
|
||||
<result property="coatingMass" column="coating_mass"/>
|
||||
<result property="edgeStatus" column="edge_status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
|
||||
Reference in New Issue
Block a user