bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算修改

This commit is contained in:
syruan 2026-01-28 18:01:26 +08:00
parent 45dba9ad51
commit c68073d7bc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -1223,6 +1223,9 @@
#{aid} #{aid}
</foreach> </foreach>
</if> </if>
<if test="info.unitId != null and info.unitId != 0">
and bai.unit_id = #{info.unitId}
</if>
<if test="info.agreementCode != null and info.agreementCode != ''"> <if test="info.agreementCode != null and info.agreementCode != ''">
and bai.agreement_code like concat('%',#{info.agreementCode},'%') and bai.agreement_code like concat('%',#{info.agreementCode},'%')
</if> </if>
@ -1353,7 +1356,9 @@
and mt.jiju_type in (1,2) and mt.jiju_type in (1,2)
</if> </if>
</if> </if>
<if test="info.unitId != null and info.unitId != 0">
and bai.unit_id = #{info.unitId}
</if>
<if test="info.endTime != null and info.startTime != null"> <if test="info.endTime != null and info.startTime != null">
and tt.create_time between #{info.startTime} and #{info.endTime} and tt.create_time between #{info.startTime} and #{info.endTime}
</if> </if>
@ -1530,8 +1535,7 @@
bp.actual_end_date as actualEndDate bp.actual_end_date as actualEndDate
FROM FROM
bm_agreement_info bai bm_agreement_info bai
LEFT JOIN slt_agreement_apply saa LEFT JOIN slt_agreement_apply saa ON bai.agreement_id = saa.agreement_id AND saa.settlement_type = #{settlementType}
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 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 bm_project bp ON bp.pro_id = bai.project_id
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit 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 mt on sad.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id
<where> <where>
<if test="unitId != null and unitId != 0">
and bai.unit_id = #{unitId}
</if>
<if test="companyId != null "> <if test="companyId != null ">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>