refactor(mes/eqp): 将设备巡检记录的产线字段类型从字符串改为长整型
1. 在EqpEquipmentInspectionRecordBo中将productionLine字段类型由String改为Long 2. 在EqpEquipmentInspectionRecordServiceImpl的查询条件中,将字符串非空判断改为Long非空判断 3. 统一前后端数据类型,为后续关联产线主键做准备
This commit is contained in:
@@ -68,7 +68,7 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity {
|
||||
/**
|
||||
* 产线
|
||||
*/
|
||||
private String productionLine;
|
||||
private Long productionLine;
|
||||
|
||||
/**
|
||||
* 巡检时间开始
|
||||
|
||||
@@ -58,7 +58,7 @@ public class EqpEquipmentInspectionRecordServiceImpl implements IEqpEquipmentIns
|
||||
qw.eq(bo.getRunStatus() != null, "r.run_status", bo.getRunStatus());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getInspector()), "r.inspector", bo.getInspector());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getAbnormalDesc()), "r.abnormal_desc", bo.getAbnormalDesc());
|
||||
qw.eq(StringUtils.isNotBlank(bo.getProductionLine()), "p.production_line", bo.getProductionLine());
|
||||
qw.eq(bo.getProductionLine() != null, "p.production_line", bo.getProductionLine());
|
||||
qw.ge(bo.getStartInspectTime() != null, "r.inspect_time", bo.getStartInspectTime());
|
||||
qw.le(bo.getEndInspectTime() != null, "r.inspect_time", bo.getEndInspectTime());
|
||||
qw.eq("r.del_flag", 0);
|
||||
|
||||
Reference in New Issue
Block a user