From 689abd905d573f5179bf4fbb065b417288cb7262 Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Fri, 22 Dec 2023 18:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE=E4=BA=8C?=
 =?UTF-8?q?=E6=94=B9=20=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/MaLabelBindMapper.xml    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 7bc9597c..03d3a92e 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -60,17 +60,19 @@
         ORDER BY b.is_bind ASC
     </select>
     <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
-        SELECT a.ma_id,a.label_code,a.bind_time,a.label_type,mt.type_id,mt.type_name,
+        SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
         mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
-        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code
-        FROM ma_label_bind a
+        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
+        FROM ma_machine_label b
+        left join ma_label_bind a on a.ma_id = b.ma_id
         LEFT JOIN ma_type mt  ON a.type_id = mt.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
         LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
         LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
         LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
-        LEFT JOIN sys_dic dic ON dic.id = a.label_type
-        LEFT JOIN ma_machine  ma on ma.ma_id = a.ma_id
+        LEFT JOIN sys_dic dic ON dic.id = b.label_type
+        LEFT JOIN ma_machine  ma ON ma.ma_id = a.ma_id
+        LEFT JOIN sys_user user on user.user_id =a.binder
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
         <where>
             <if test="labelCode != null  and labelCode != ''"> and a.label_code = #{labelCode}</if>
@@ -163,7 +165,7 @@
     </delete>
 
     <update id="updateMaLabelBindByMaIds" parameterType="Long">
-        update ma_label_bind set status = '0' where id = #{id}
+        update ma_label_bind set status = '2' where id = #{id}
     </update>
 
     <select id="selectMaMachineMaId" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">