diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java index 53138973..9553d4af 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java @@ -68,7 +68,7 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity { /** * 产线 */ - private String productionLine; + private Long productionLine; /** * 巡检时间开始 diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java index ed3601ba..fe58089b 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java @@ -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);