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

Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2025-09-24 21:32:55 +08:00
parent b06a0be9a3 d3678516a1
commit e8d5685ac9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
View File

@ -34,8 +34,7 @@
WHERE WHERE
mm.ma_status='2' and sai.is_slt = 0 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,6012,6761)
and bp.external_id in("2093dba755b7427bb6621e408bf7fadb","4ba1b9739ea74cfc85f50f2b12e35872") and bp.external_id is not null
and bp.pro_name is not null
AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and ( and (
@ -104,7 +103,7 @@
sai.`status` = 0 and sai.is_slt = 0 and sai.`status` = 0 and sai.is_slt = 0 and
mm.ma_status='2' mm.ma_status='2'
and mt2.type_id not in (6032,6008,6270,6012,6761) and mt2.type_id not in (6032,6008,6270,6012,6761)
and bp.external_id in("2093dba755b7427bb6621e408bf7fadb","4ba1b9739ea74cfc85f50f2b12e35872") and bp.external_id is not null
AND mt.jiju_type =2 AND mt.jiju_type =2
AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
) res ) res
@ -186,6 +185,7 @@
WHERE WHERE
sai.`status` = 0 and sai.is_slt = 0 and sai.`status` = 0 and sai.is_slt = 0 and
mm.ma_status='2' mm.ma_status='2'
and mt2.type_id not in (6032,6008,6270,6012,6761)
and bp.external_id is not null and bp.external_id is not null
AND mt.jiju_type =2 AND mt.jiju_type =2
AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 day) AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 day)