From 3888e72842d153cd679b2d18b3e5b4b786d2f4a0 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 31 Jul 2025 18:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/SelectServiceImpl.java       |  2 +-
 .../domain/UseMaintenanceWarningBean.java            | 12 +++++++++---
 .../warningAnalysis/UseMaintenanceWarningMapper.xml  | 10 ++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
index 4fb1b256..459f44ca 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
@@ -221,7 +221,7 @@ public class SelectServiceImpl implements SelectService {
                 ProjectTreeBuild treeBuild = new ProjectTreeBuild(list);
                 // 原查询结果转换树形结构
                 groupList = treeBuild.buildTree();
-                // 获取已授权班组，进行数据拼接
+                // 获取班组，进行数据拼接
                 List<ProjectTreeNode> newList = mapper.getTeamList(bean);
                 if (CollectionUtils.isNotEmpty(newList)) {
                     groupList.addAll(newList);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
index d65fa951..787537d7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
@@ -83,10 +83,10 @@ public class UseMaintenanceWarningBean extends BaseEntity {
     private Long projectId;
 
     /**
-     * 超期天数
+     * 临检天数
      */
-    @ApiModelProperty(value = "超期时长（天）")
-    @Excel(name = "超期时长（天）")
+    @ApiModelProperty(value = "临检天数")
+    @Excel(name = "临检天数")
     private Long overDays;
 
     @ApiModelProperty(value = "开始时间")
@@ -97,4 +97,10 @@ public class UseMaintenanceWarningBean extends BaseEntity {
 
     @ApiModelProperty(value = "关键字")
     private String keyWord;
+
+    @ApiModelProperty(value = "三级类型id")
+    private Long thirdTypeId;
+
+    @ApiModelProperty(value = "类型id")
+    private Long typeId;
 }
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 b5dc763a..56ec65cc 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
@@ -14,7 +14,7 @@
         bu.unit_name as unitName,
         bp.pro_name as projectName,
         bai.agreement_code as agreementCode,
-        DATEDIFF(CURDATE(), mm.next_check_time) AS overDays
+        DATEDIFF(mm.next_check_time, CURDATE()) AS overDays
         FROM
         ma_machine mm
         LEFT JOIN ma_type mt on mt.type_id=mm.type_id
@@ -29,7 +29,7 @@
         WHERE
         mm.ma_status='2'
         and bp.pro_name is not null
-        AND mm.next_check_time &lt; CURDATE()
+        AND mm.next_check_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
         <if test="keyWord != null  and keyWord != ''">
             and (mt2.type_name like concat('%', #{keyWord}, '%') or
             mt.type_name like concat('%', #{keyWord}, '%') or
@@ -42,6 +42,12 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( mm.next_check_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+        <if test="typeId != null">
+            AND mt.type_id = #{typeId}
+        </if>
+        <if test="thirdTypeId != null">
+            AND mt2.type_id = #{thirdTypeId}
+        </if>
         ORDER BY mm.next_check_time ASC
     </select>