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 DATE_ADD(#{endTime}, INTERVAL 1 DAY) + + 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},'%') + ) + + + and sas.slt_status in + + #{item} + + and bui.unit_id = #{unitId} 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 @@ AND mt2.type_id = #{thirdTypeId} - 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