From 34288042b045bd52f41b35124b6d8cebf701e4fe Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Thu, 18 Dec 2025 14:42:28 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 .../main/resources/mapper/material/back/BackChangeMapper.xml   | 3 ++-
 .../main/resources/mapper/material/device/MaDevQcMapper.xml    | 2 +-
 .../src/main/resources/mapper/material/repair/RepairMapper.xml | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
index 541cb7a..d691285 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml
@@ -89,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="updateMaDevInfo">
         UPDATE ma_dev_info
-        set ma_status  = #{maStatus}
+        set ma_status  = #{maStatus},
+            change_status=#{maStatus}
         WHERE code = #{devCode}
     </update>
 
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 9a094dd..2de37f4 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
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and m1.qc_code like concat('%',#{qcCode},'%')
             </if>
             <if test="qcStartTime != null and qcStartTime != '' and qcEndTime != null and qcEndTime != ''">
-                and DATE_FORMAT(m1.qc_time,'%Y-%m-%d') between #{qcStartTime} and #{qcEndTime}
+                and DATE_FORMAT(m1.next_check_time,'%Y-%m-%d') between #{qcStartTime} and #{qcEndTime}
             </if>
             <if test="createStartTime != null and createStartTime != '' and createEndTime != null and createEndTime != ''">
                 and DATE_FORMAT(m1.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime}
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml
index 11653c8..7d597ae 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml
@@ -104,9 +104,11 @@
         <if test="isScrapFilter != null">
             <if test="isScrapFilter==0">
                 ma_status='1',
+                change_status='1',
             </if>
             <if test="isScrapFilter==1">
                 ma_status='99',
+                change_status='4',
             </if>
         </if>
         <if test="createBy != null">