From 538f885f40732eacf9ae919ca7b30b476e318ad4 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 12 Jan 2026 10:04:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=B9=B6=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DmsInspectInstanceDetail 实体中新增 machineName 字段 - 添加 DmsBaseMachineInfo 和 DmsInspectRouteDetail 的依赖引入 - 实现设备表关联查询以获取设备名称功能 - 优化查询条件确保数据准确性 - 更新业务逻辑层适配新的查询结构 --- .../org/dromara/dms/domain/DmsInspectInstanceDetail.java | 6 ++++++ .../service/impl/DmsInspectInstanceDetailServiceImpl.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java index 2d186eaf..87ab00e0 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectInstanceDetail.java @@ -90,4 +90,10 @@ public class DmsInspectInstanceDetail extends TenantEntity { @TableField(exist = false) private List dmsInspectInstanceDetailProjectList; + /** + * 设备名称 + */ + @TableField(exist = false) + private String machineName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java index 8567a4c6..12367dec 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectInstanceDetailServiceImpl.java @@ -9,8 +9,10 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.dms.domain.DmsBaseMachineInfo; import org.dromara.dms.domain.DmsBillsInspectInstance; import org.dromara.dms.domain.DmsInspectInstanceDetail; +import org.dromara.dms.domain.DmsInspectRouteDetail; import org.dromara.dms.domain.bo.DmsInspectInstanceDetailBo; import org.dromara.dms.domain.vo.DmsBillsInspectInstanceVo; import org.dromara.dms.domain.vo.DmsInspectInstanceDetailVo; @@ -76,6 +78,11 @@ public class DmsInspectInstanceDetailServiceImpl implements IDmsInspectInstanceD Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(DmsInspectInstanceDetail.class) .selectAll(DmsInspectInstanceDetail.class) + + //关联查询设备 + .select(DmsBaseMachineInfo::getMachineName) + .leftJoin(DmsBaseMachineInfo.class, DmsBaseMachineInfo::getMachineId, DmsInspectRouteDetail::getMachineId) + .eq(bo.getInstanceDetailId() != null, DmsInspectInstanceDetail::getInstanceDetailId, bo.getInstanceDetailId()) .eq(bo.getInspectInstanceId() != null, DmsInspectInstanceDetail::getInspectInstanceId, bo.getInspectInstanceId()) .eq(bo.getLineStep() != null, DmsInspectInstanceDetail::getLineStep, bo.getLineStep())