From f53e48c04dd41724f19b5dc7cf43408f376f2312 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 14 May 2025 08:43:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E5=B7=A1=E6=A3=80=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 DmsInspectRouteDetail 模型中添加 standardName 字段
- 在 DmsInspectRouteDetailServiceImpl服务中加入标准名称的查询
- 在 DmsInspectRouteDetailVo 视图中添加 standardName 字段
---
 .../java/org/dromara/dms/domain/DmsInspectRouteDetail.java | 7 +++++++
 .../org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java | 5 +++++
 .../dms/service/impl/DmsInspectRouteDetailServiceImpl.java | 7 +++++++
 3 files changed, 19 insertions(+)

diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
index c0d6b72d..8c8d058a 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
@@ -64,4 +64,11 @@ public class DmsInspectRouteDetail extends TenantEntity {
     @TableField(exist = false)
     private String machineName;//JOIN
 
+    /**
+     * 标准名称
+     */
+    @TableField(exist = false)
+    private String standardName;
+
+
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
index 34a3290d..a13797ac 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
@@ -75,4 +75,9 @@ public class DmsInspectRouteDetailVo implements Serializable {
      */
     private String machineName;//JOIN
 
+    /**
+     * 标准名称
+     */
+    private String standardName;//JOIN
+
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
index 4a0ab4d0..f286503a 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
@@ -11,6 +11,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.dms.domain.DmsBaseInspectRoute;
+import org.dromara.dms.domain.DmsBaseInspectStandard;
 import org.dromara.dms.domain.DmsBaseMachineInfo;
 import org.springframework.stereotype.Service;
 import org.dromara.dms.domain.bo.DmsInspectRouteDetailBo;
@@ -83,10 +84,16 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
             .select(DmsBaseMachineInfo::getMachineName)
             .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId,DmsInspectRouteDetail::getMachineId)
 
+            .select(DmsBaseInspectStandard::getStandardName)
+            .leftJoin(DmsBaseInspectStandard.class, DmsBaseInspectStandard::getInspectStandardId,DmsInspectRouteDetail::getInspectStandard)
+
         .eq(bo.getRouteDetailId() != null, DmsInspectRouteDetail::getRouteDetailId, bo.getRouteDetailId())
         .eq(bo.getInspectRouteId() != null, DmsInspectRouteDetail::getInspectRouteId, bo.getInspectRouteId())
         .eq(bo.getLineStep() != null, DmsInspectRouteDetail::getLineStep, bo.getLineStep())
         .eq(bo.getMachineId() != null, DmsInspectRouteDetail::getMachineId, bo.getMachineId())
+
+            .eq(bo.getInspectStandard() != null, DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard())
+
         .eq(StringUtils.isNotBlank(bo.getInspectStandard()), DmsInspectRouteDetail::getInspectStandard, bo.getInspectStandard())
         .orderByDesc(DmsInspectRouteDetail::getCreateTime);
         return lqw;