From b645ab383a10d89316160eb5a1b85a38b0e2bbf3 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Mon, 8 Sep 2025 18:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=95=B0=E6=8D=AE=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/push/ProDataUseInfoMapper.xml   | 4 ++++
 1 file changed, 4 insertions(+)

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 59cd23bc..c4423f0a 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
@@ -179,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
     <select id="getApproachingAndTimeout" resultType="com.bonus.material.push.domain.StaticsNumsBean">
+
         SELECT
         COUNT(CASE
         WHEN mm.next_check_time BETWEEN NOW() AND DATE_ADD(NOW(), INTERVAL 30 DAY)
@@ -201,10 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and sai.`status`='0' and sai.end_time is null
         and bp.external_id is not null
         and mm.ma_status = 2
+        and mt2.type_id not in (6032,6008,6270)
         <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">
         SELECT
@@ -233,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and bp.external_id is not null
         and sai.`status`='0' and sai.end_time is null
         and mm.ma_status = 2
+        and mt2.type_id not in (6032,6008,6270)
         <if test="proId != null">
             AND bp.pro_id = #{proId}
         </if>