diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml index 8235d321..34eb889f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml @@ -80,7 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project bp ON bai.project_id = bp.pro_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 - WHERE bp.pro_id = #{proId} + where 1=1 + + AND bp.pro_id = #{proId} + AND mm.next_check_time IS NOT NULL GROUP BY bp.pro_id @@ -107,8 +110,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd on bp.imp_unit = sd.dept_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 - WHERE bp.pro_id = #{proId} - AND mm.next_check_time IS NOT NULL + WHERE mm.next_check_time IS NOT NULL + + AND bp.pro_id = #{proId} + AND mm.next_check_time BETWEEN NOW() AND DATE_ADD(NOW(), INTERVAL 30 DAY)