From 63ec64e82aeb6abfb849aa612730731433dfc0cb Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 23 Dec 2024 10:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=B4=A8=E6=A3=80=E5=91=A8=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/device/MaDevQcMapper.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
index 2fc3bcd..5581b4a 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml
@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m1.qc_code AS qcCode,
         m1.qc_user AS qcUser,
         m1.qc_time AS qcTime,
+        m3.maintenance_alarm_day,
         su.nick_name AS createBy,
         m1.create_time AS updateTime,
         aa.create_time AS createTime
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ma_dev_qc m1
         LEFT JOIN ma_dev_info m2 ON m1.ma_id = m2.ma_id
         AND m2.is_active = '1'
+        left join ma_type m3 ON m2.type_id = m3.type_id
         LEFT JOIN sys_user su ON su.user_id = m1.create_by
         INNER JOIN ( SELECT count(*) as num, ma_id, MAX( qc_time ) AS max_qc_time FROM ma_dev_qc GROUP BY ma_id ) latest_qc ON m1.ma_id = latest_qc.ma_id
         AND m1.qc_time = latest_qc.max_qc_time