From 21e47c1c78cd979fc0c913d3156a7901735ab863 Mon Sep 17 00:00:00 2001 From: lizhenhua <1075222162@qq.com> Date: Thu, 10 Jul 2025 15:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=AE=A1=E7=90=86=20youhua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/device/domain/vo/DevInfoVo.java | 3 +++ .../com/bonus/material/equipment/domain/EquipmentDetail.java | 1 + .../mapper/material/equipment/DeptEquipmentConfigMapper.xml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 60d806a..1f4fdd3 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -176,6 +176,9 @@ public class DevInfoVo extends DevInfo { private String devicenewName; + private String deviceId; + private String deviceTypeName; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java index 6b5aa74..0bc0677 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java @@ -54,6 +54,7 @@ public class EquipmentDetail { private String orderCount; private String combinedName; private String labelVol; + private String typeId; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml index 4cb732e..8f1776f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml @@ -57,7 +57,7 @@ LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id AND mt1.del_flag = '0' WHERE - d.is_active = '1' and d.device_name=#{devicenewName} AND d.own_co=#{companyName} + d.is_active = '1' and mt3.type_id=#{deviceId} AND d.own_co=#{companyName}