代码提交

This commit is contained in:
liang.chao 2025-09-04 21:18:44 +08:00
parent 64a0130fe5
commit 7025f28b46
1 changed files with 8 additions and 3 deletions

View File

@ -282,7 +282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as unit,
mt2.type_name as typeName,
sd.dept_name as deptName,
sd.pro_center as proCenter
bp.pro_center as proCenter
from slt_agreement_info sai
left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
left join bm_project bp on bai.project_id = bp.pro_id
@ -290,7 +290,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.status = 0 and bp.actual_end_date is not null
and sd.dept_id = #{deptId}
<if test="deptId != null">
and sd.dept_id = #{deptId}
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
@ -673,7 +675,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.status = 0 and bp.actual_end_date is not null
and bp.pro_center is not null and bp.pro_center= #{proCenter}
and bp.pro_center is not null
<if test="proCenter != null and proCenter !=''">
and bp.pro_center= #{proCenter}
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>