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 172c2786..99372193 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 @@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sai.`status`='0' and sai.end_time is null and mm.ma_status = 2 - and mt2.type_id not in (6032,6008,6270,6012,6761) + and mt2.type_id not in (6032,6008,6270) and mt.jiju_type =2 AND sd.dept_id = #{deptId} @@ -273,7 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sai.`status`='0' and sai.end_time is null and mm.ma_status = 2 - and mt2.type_id not in (6032,6008,6270,6012,6761) + and mt2.type_id not in (6032,6008,6270) and mt.jiju_type =2 AND bp.pro_id = #{proId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml index d94a60e7..40562d14 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml @@ -40,7 +40,7 @@ LEFT JOIN sys_dept sd on sd.dept_id = bp.imp_unit WHERE mm.ma_status='2' and sai.is_slt = 0 - and mt2.type_id not in (6032,6008,6270,6012,6761) + and mt2.type_id not in (6032,6008,6270) and bp.pro_name is not null AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) @@ -109,7 +109,7 @@ WHERE sai.`status` = 0 and sai.is_slt = 0 and mm.ma_status='2' - and mt2.type_id not in (6032,6008,6270,6012,6761) + and mt2.type_id not in (6032,6008,6270) and bp.external_id is not null AND mt.jiju_type =2 AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) @@ -196,7 +196,7 @@ WHERE sai.`status` = 0 and sai.is_slt = 0 and mm.ma_status='2' - and mt2.type_id not in (6032,6008,6270,6012,6761) + and mt2.type_id not in (6032,6008,6270) and bp.external_id is not null AND mt.jiju_type =2 AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 day) @@ -248,7 +248,7 @@ AND mm.this_check_time is not null AND mm.next_check_time is not null AND mt.jiju_type = 2 - AND mt2.type_id not in (6032,6008,6270,6012,6761) + AND mt2.type_id not in (6032,6008,6270) AND DATEDIFF(mm.next_check_time, CURDATE()) <= 30 AND mm.next_check_time >= CURDATE()