From ec1824b586c13ebafdca0896eec3bcf9c21d903c Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Sat, 23 Dec 2023 21:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=20=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/base/service/impl/MaLabelBindServiceImpl.java      | 1 +
 .../src/main/resources/mapper/base/MaLabelBindMapper.xml    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
index 686901eb..fea8bb50 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
@@ -75,6 +75,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
             MaMachine maMachine =new MaMachine();
             maMachine.setMaCode(maLabelBind.getMaCode());
             maMachine.setTypeId(maLabelBind.getTypeId());
+            maMachine.setQrCode(maLabelBind.getLabelCode());
             maLabelBindMapper.insertMaLabel(maMachine);
             maLabelBind.setMaId(String.valueOf(maMachine.getMaId()));
             maLabelBind.setStatus("1");
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 03d3a92e..aa7dc993 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
@@ -57,7 +57,7 @@
             <if test="wpName != null  and wpName != ''"> and mt3.type_name = #{wpName}</if>
             <if test="isBind != null  and isBind != ''"> and b.is_bind = #{isBind}</if>
         </where>
-        ORDER BY b.is_bind ASC
+        ORDER BY b.is_bind ASC,b.create_time DESC
     </select>
     <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
         SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
@@ -190,7 +190,7 @@
         </trim>
     </insert>
     <insert id="insertMaLabel" useGeneratedKeys="true" keyProperty="maId">
-        insert into ma_machine (type_id,ma_code,create_time)
-        values (#{typeId},#{maCode},now());
+        insert into ma_machine (type_id,ma_code,ma_status,qr_code,create_time)
+        values (#{typeId},#{maCode},'15',#{qrCode},now());
     </insert>
 </mapper>
\ No newline at end of file