From 6cbdfb192738e4853163c41f8c747d1afe7c7a02 Mon Sep 17 00:00:00 2001 From: zangchenhao Date: Mon, 7 Jul 2025 10:50:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):DmsRecordShutDown=E8=81=94=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=81=9C=E6=9C=BA=E7=B1=BB=E5=9E=8B=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=81=9C=E6=9C=BA=E5=8E=9F=E5=9B=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DmsRecordShutDown 类中添加 shutTypeCode 和 shutReasonName 字段 - 更新 DmsRecordShutDownServiceImpl 中的查询方法，关联查询停机原因信息 --- .../org/dromara/dms/domain/DmsRecordShutDown.java | 12 ++++++++++++ .../service/impl/DmsRecordShutDownServiceImpl.java | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java index 330d9af..cb3c9ae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java @@ -93,4 +93,16 @@ public class DmsRecordShutDown extends TenantEntity { @TableField(exist = false) private String shutTypeName;//JOIN + /** + * 停机类型编号 + */ + @TableField(exist = false) + private String shutTypeCode;//JOIN + + /** + * 停机原因 + */ + @TableField(exist = false) + private String shutReasonName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java index 89a0224..f320ae2 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordShutDownServiceImpl.java @@ -9,6 +9,7 @@ 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.DmsBaseShutReason; import org.dromara.dms.domain.DmsBaseShutType; import org.dromara.dms.domain.DmsRecordShutDown; import org.dromara.dms.domain.bo.DmsRecordShutDownBo; @@ -82,9 +83,8 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService { .select(DmsBaseShutType::getShutTypeName) .leftJoin(DmsBaseShutType.class,DmsBaseShutType::getShutTypeId,DmsRecordShutDown::getShutTypeId) //关联查询停机原因信息 -/* .select(DmsBaseShutReason::getReasonCode,DmsBaseShutReason::getShutReason) - .select(DmsBaseShutReason::getReasonCode) - .leftJoin(DmsBaseShutReason.class,DmsBaseShutReason::getShutReasonId,DmsRecordShutDown::getShutReasonId)*/ + .selectAs(DmsBaseShutReason::getShutReason,DmsRecordShutDown::getShutReasonName) + .leftJoin(DmsBaseShutReason.class,DmsBaseShutReason::getShutReasonId,DmsRecordShutDown::getShutReasonId) .eq(bo.getRecordShutDownId() != null, DmsRecordShutDown::getRecordShutDownId, bo.getRecordShutDownId()) .eq(bo.getMachineId() != null, DmsRecordShutDown::getMachineId, bo.getMachineId())