From c2ef40f2cfd589a91738a202b9e3949f57a2c681 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 29 Sep 2025 15:48:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DmsBaseMachineInfo 实体类中新增 deviceTypeName 字段 - 在 DmsBaseMachineInfoBo 业务对象中新增 deviceTypeName段 - 在 字 DmsBaseMachineInfoServiceImpl 中配置 deviceTypeName 的查询映射 - 在 DmsBaseMachineInfoVo 视图对象中新增 deviceTypeName 字段 --- .../java/org/dromara/dms/domain/DmsBaseMachineInfo.java | 6 ++++++ .../org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java | 5 +++++ .../org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java | 5 +++++ .../dms/service/impl/DmsBaseMachineInfoServiceImpl.java | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java index 8ce3c5f9..59a3c5b5 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java @@ -148,4 +148,10 @@ public class DmsBaseMachineInfo extends TenantEntity { */ private String ossId; + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java index 52b33351..91ed621e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java @@ -147,4 +147,9 @@ public class DmsBaseMachineInfoBo extends BaseEntity { */ private String ossId; + /** + * 设备类型名称 + */ + private String deviceTypeName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java index 42b462c4..4b505aae 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java @@ -205,4 +205,9 @@ public class DmsBaseMachineInfoVo implements Serializable { */ private String ossId; + /** + * 设备类型名称 + */ + private String deviceTypeName; + } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java index 58753479..39f65fc8 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java @@ -161,7 +161,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId) .leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/ - .select(DmsBaseDeviceType::getDeviceTypeName) + .selectAs(DmsBaseDeviceType::getDeviceTypeName, DmsBaseMachineInfo::getDeviceTypeName) .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType) .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())