问题修复

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>

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