From c68073d7bc6a58a3ef3517d75ff315f54b0b7132 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 28 Jan 2026 18:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/settlement/SltAgreementInfoMapper.xml | 13 ++++++++++--- 1 file changed, 10 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 f83562ac..1583991e 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 @@ -1223,6 +1223,9 @@ #{aid} + + and bai.unit_id = #{info.unitId} + and bai.agreement_code like concat('%',#{info.agreementCode},'%') @@ -1353,7 +1356,9 @@ and mt.jiju_type in (1,2) - + + and bai.unit_id = #{info.unitId} + and tt.create_time between #{info.startTime} and #{info.endTime} @@ -1530,8 +1535,7 @@ bp.actual_end_date as actualEndDate FROM bm_agreement_info bai - LEFT JOIN slt_agreement_apply saa - ON bai.agreement_id = saa.agreement_id AND saa.settlement_type = #{settlementType} + LEFT JOIN slt_agreement_apply saa ON bai.agreement_id = saa.agreement_id AND saa.settlement_type = #{settlementType} LEFT JOIN slt_agreement_details sad ON saa.id = sad.apply_id AND sad.slt_type = '2' LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit @@ -1539,6 +1543,9 @@ left join ma_type mt on sad.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id + + and bai.unit_id = #{unitId} + and bai.company_id = #{companyId}