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-09-19 15:43:53 +08:00
parent 6b623f2eab 8000e6e4f8
commit a4d1ebd228
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
THEN 1
ELSE NULL
END) AS ApproachingNum,
0 AS TimeoutNum AS TimeoutNum
0 AS TimeoutNum
FROM ma_machine mm
LEFT JOIN slt_agreement_info sai on sai.ma_id = mm.ma_id and mm.type_id = sai.type_id
LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id
@ -240,7 +240,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null">
AND sd.dept_id = #{deptId}
</if>
AND mm.next_check_time IS NOT NULL
</select>
<select id="getApproachingDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">