From 8638358fa1b56f660923839b56d9baac0731f5d6 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 19 Aug 2024 17:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=AE=9A=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java   | 8 ++++++++
 .../resources/mapper/largeScreen/LargeScreenMapper.xml    | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java
index 5bbc0930..30e2c16e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/IotMaCodeMachine.java
@@ -13,6 +13,14 @@ public class IotMaCodeMachine {
      * 机具编码
      */
     private String maCode;
+    /**
+     * 类型型号
+     */
+    private String typeName;
+    /**
+     * 规格型号
+     */
+    private String typeModelName;
     /**
      * 机具状态
      */
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index e35cb54e..d168ef75 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -888,6 +888,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getIotMaCodeMachine" resultType="com.bonus.sgzb.largeScreen.domain.IotMaCodeMachine">
         SELECT
             im.iot_code as iotCode,
+            mt.type_name as typeModelName,
+            mt1.type_name as typeName,
             bpl.lot_id as projectId,
             bpl.lot_name as projectName,
             sd.name as maStatus,
@@ -898,6 +900,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             iot_machine im
                 LEFT JOIN iot_machine_bind imb ON imb.iot_id = im.id
                 LEFT JOIN ma_machine mm ON imb.ma_code = mm.ma_code
+                left join ma_type mt on mm.type_id = mt.type_id
+                left join ma_type mt1 on mt1.type_id = mt.parent_id
                 LEFT JOIN sys_dic sd on mm.ma_status = sd.id
                 LEFT JOIN slt_agreement_info sai ON mm.type_id = sai.type_id
                 AND mm.ma_id = sai.ma_id