refactor(mes/eqp): 将设备备件的产线字段类型从字符串改为长整型
1. 在EqpEquipmentPart实体类、Bo和Vo中将productionLine字段类型由String改为Long 2. 在EqpEquipmentPartServiceImpl的查询条件中,将字符串非空判断改为Long非空判断 3. 统一前后端数据类型,为后续关联产线主键做准备
This commit is contained in:
@@ -31,7 +31,7 @@ public class EqpEquipmentPart extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 产线
|
* 产线
|
||||||
*/
|
*/
|
||||||
private String productionLine;
|
private Long productionLine;
|
||||||
/**
|
/**
|
||||||
* 产线段
|
* 产线段
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class EqpEquipmentPartBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 产线
|
* 产线
|
||||||
*/
|
*/
|
||||||
private String productionLine;
|
private Long productionLine;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 产线段
|
* 产线段
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class EqpEquipmentPartVo {
|
|||||||
* 产线
|
* 产线
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "产线")
|
@ExcelProperty(value = "产线")
|
||||||
private String productionLine;
|
private Long productionLine;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 产线段
|
* 产线段
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService {
|
|||||||
Map<String, Object> params = bo.getParams();
|
Map<String, Object> params = bo.getParams();
|
||||||
LambdaQueryWrapper<EqpEquipmentPart> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<EqpEquipmentPart> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
|
lqw.eq(StringUtils.isNotBlank(bo.getInspectPart()), EqpEquipmentPart::getInspectPart, bo.getInspectPart());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), EqpEquipmentPart::getProductionLine, bo.getProductionLine());
|
lqw.eq(bo.getProductionLine() != null, EqpEquipmentPart::getProductionLine, bo.getProductionLine());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
|
lqw.eq(StringUtils.isNotBlank(bo.getLineSection()), EqpEquipmentPart::getLineSection, bo.getLineSection());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson());
|
lqw.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson());
|
||||||
return lqw;
|
return lqw;
|
||||||
|
|||||||
Reference in New Issue
Block a user