From 82a54e320016c02c39c81f49cba7b08d00bbc756 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 29 May 2026 11:16:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mes/eqp):=20=E5=B0=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95=E7=9A=84=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E6=94=B9=E4=B8=BA=E9=95=BF=E6=95=B4=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 在EqpEquipmentInspectionRecordBo中将productionLine字段类型由String改为Long
2. 在EqpEquipmentInspectionRecordServiceImpl的查询条件中，将字符串非空判断改为Long非空判断
3. 统一前后端数据类型，为后续关联产线主键做准备
---
 .../klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java   | 2 +-
 .../service/impl/EqpEquipmentInspectionRecordServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);