diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java index 630373d2..cee193a1 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentPart.java @@ -31,7 +31,7 @@ public class EqpEquipmentPart extends BaseEntity { /** * 产线 */ - private String productionLine; + private Long productionLine; /** * 产线段 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java index 8dab0af3..928c8229 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentPartBo.java @@ -31,7 +31,7 @@ public class EqpEquipmentPartBo extends BaseEntity { /** * 产线 */ - private String productionLine; + private Long productionLine; /** * 产线段 diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java index b1a6c416..3f3fdeeb 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java @@ -37,7 +37,7 @@ public class EqpEquipmentPartVo { * 产线 */ @ExcelProperty(value = "产线") - private String productionLine; + private Long productionLine; /** * 产线段 diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java index 92fa3ccc..ce25f8bd 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java @@ -82,7 +82,7 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); 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.like(StringUtils.isNotBlank(bo.getResponsiblePerson()), EqpEquipmentPart::getResponsiblePerson, bo.getResponsiblePerson()); return lqw;