From f9dd410e7e126e5ced538b209684769e587bbe99 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 17 Nov 2025 10:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9D=E7=BC=98=E6=89=8B=E5=A5=97=EF=BC=88?= =?UTF-8?q?=E9=9E=8B=EF=BC=89=E6=9F=A5=E8=AF=A2=E9=A2=84=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/material/clz/MaterialMachineMapper.xml | 2 +- .../mapper/material/expectations/ExpectationsMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 9e13a0e1..ffd25a37 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -798,7 +798,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sai.is_slt = '0' AND mm.ma_status = 2 AND sai.ma_id IS NOT NULL - AND mt2.type_id not in (6032,6008,6270,6012,6761) + AND mt2.type_id not in (6032,6008,6270) AND bp.pro_id not in (3414,1192,3321,3595) AND mm.this_check_time is not null AND mm.next_check_time is not null diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml index 8c783cbb..c68bbd71 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml @@ -51,7 +51,7 @@ LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id WHERE mm.ma_status = #{useStatus} AND mm.next_check_time < DATE_ADD(CURDATE(), INTERVAL 30 DAY) - AND mt2.type_id not in (6032,6008,6270,6012,6761) + AND mt2.type_id not in (6032,6008,6270) GROUP BY name;