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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-11-19 15:37:55 +08:00
parent c721b26c33 680921426d
commit 1fe52be0fe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -317,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt2 on mt.parent_id = mt2.type_id left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.is_slt = 0 and bp.actual_end_date is not null and bp.pro_center is not null and bp.external_id is not null where sai.is_slt = 0 and bp.actual_end_date is not null and bp.pro_center is not null and bp.external_id is not null
and dept_id not in (339,340,342,346) and dept_id not in (339,340,342,346)
and bai.is_show = 1
and mt.jiju_type = 1 and mt.jiju_type = 1
and mt2.is_statics != 1 and mt2.is_statics != 1
<if test="deptName != null and deptName != ''"> <if test="deptName != null and deptName != ''">
@ -342,9 +343,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt on sai.type_id = mt.type_id left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.is_slt = 0 and bp.actual_end_date is not null and bp.pro_center is not null and bp.external_id is not null where sai.is_slt = 0 and bp.actual_end_date is not null and bp.pro_center is not null and bp.external_id is not null
and sai.status = 0
and mt.jiju_type = 1 and mt.jiju_type = 1
and mt2.is_statics != 1 and mt2.is_statics != 1
and dept_id not in (339,340,342,346) and dept_id not in (339,340,342,346)
and bai.is_show = 1
<if test="deptId != null"> <if test="deptId != null">
and sd.dept_id = #{deptId} and sd.dept_id = #{deptId}
</if> </if>
@ -707,6 +710,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join bm_project bp on bai.project_id = bp.pro_id left join bm_project bp on bai.project_id = bp.pro_id
left join sys_dept sd on bp.imp_unit = sd.dept_id left join sys_dept sd on bp.imp_unit = sd.dept_id
where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and sd.dept_name = #{deptName} and bp.pro_center is not null and bp.external_id is not null where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and sd.dept_name = #{deptName} and bp.pro_center is not null and bp.external_id is not null
and bai.is_show = 1
GROUP BY bp.pro_center GROUP BY bp.pro_center
</select> </select>
<select id="getCompletionNotRefundedDetailsSub" resultType="com.bonus.material.push.domain.MachineInfoBean"> <select id="getCompletionNotRefundedDetailsSub" resultType="com.bonus.material.push.domain.MachineInfoBean">
@ -727,6 +731,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type mt on sai.type_id = mt.type_id left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.status = 0 and sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and bp.pro_center is not null where sai.status = 0 and sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and bp.pro_center is not null
and bai.is_show = 1
and mt.jiju_type = 1 and mt.jiju_type = 1
and mt2.is_statics != 1 and mt2.is_statics != 1
and dept_id not in (339,340,342,346) and dept_id not in (339,340,342,346)

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

@ -1692,8 +1692,8 @@
sad.price as leasePrice, sad.price as leasePrice,
sad.num as num, sad.num as num,
DATE(sad.start_time) as startTime, DATE(sad.start_time) as startTime,
DATE(ifnull(saa.create_time,sad.end_time)) as endTime, DATE(ifnull(sad.end_time,saa.create_time)) as endTime,
DATEDIFF(IF(sad.end_time is null,saa.create_time,sad.end_time), sad.start_time) + 1 as leaseDays DATEDIFF(IF(sad.end_time is null,sad.end_time,saa.create_time), sad.start_time) + 1 as leaseDays
FROM FROM
bm_agreement_info bai 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}