From 40be3363222a4ab726ad0a7244a72e6a862ce47a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 29 Jan 2026 15:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/settlement/SltAgreementInfoMapper.xml | 14 ++++++++++++++
 .../UseMaintenanceWarningMapper.xml                |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
index bd6c33a1..f02b893b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
@@ -684,6 +684,20 @@
             and saa.audit_time >= #{startTime}
             and saa.audit_time <![CDATA[ < ]]> DATE_ADD(#{endTime}, INTERVAL 1 DAY)
         </if>
+        <if test="keyWord != null and keyWord != ''">
+            AND (
+            bai.agreement_code like concat('%',#{keyWord},'%')
+            OR bui.unit_name like concat('%',#{keyWord},'%')
+            OR bp.pro_name like concat('%',#{keyWord},'%')
+            OR sd.dept_name like concat('%',#{keyWord},'%')
+            )
+        </if>
+        <if test="statusList != null  and statusList.size() > 0">
+            and sas.slt_status in
+            <foreach item="item" collection="statusList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="unitId != null  and unitId != ''">
             and bui.unit_id = #{unitId}
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
index 6ae0bb6a..73fe306f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
@@ -290,9 +290,9 @@
         <if test="thirdTypeId != null">
             AND mt2.type_id = #{thirdTypeId}
         </if>
-        GROUP BY
-        mt2.type_name,
-        mm.ma_code
+--         GROUP BY
+--         mt2.type_name,
+--         mm.ma_code
         ORDER BY
         SUBSTRING( mt2.type_name, 1, 1 ) ASC ,
         mm.next_check_time ASC