From d7cdc490b77e7d27a019578ee45ce155b8fabb0b Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 6 Sep 2025 13:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warningAnalysis/domain/UseMaintenanceWarningBean.java | 8 ++++++++
 .../resources/mapper/material/ma/TypeKeeperMapper.xml     | 1 +
 .../warningAnalysis/UseMaintenanceWarningMapper.xml       | 3 +++
 3 files changed, 12 insertions(+)

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 23fe0edb..eb5526f7 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
@@ -21,6 +21,14 @@ import java.util.Date;
 public class UseMaintenanceWarningBean extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 本次检验日期
+     */
+    @ApiModelProperty(value = "本次检验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "本次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date thisCheckTime;
+
     /**
      * 下次检验日期
      */
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeKeeperMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeKeeperMapper.xml
index d281a4dc..9d9bb564 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeKeeperMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeKeeperMapper.xml
@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join
             sys_user u on tk.user_id = u.user_id
         <where>
+            u.nick_name IS NOT NULL
             <if test="userId != null "> and tk.user_id = #{userId}</if>
             <if test="typeId != null "> and tk.type_id = #{typeId}</if>
             <if test="companyId != null "> and tk.company_id = #{companyId}</if>
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 67cd274e..d8d9a6a3 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
@@ -203,6 +203,7 @@
     <select id="getOverTimeListList" resultType="com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean">
         SELECT
         mm.ma_id as maId,
+        mm.this_check_time as thisCheckTime,
         mm.next_check_time as nextCheckTime,
         mt3.type_name as materialType,
         mt2.type_name as typeName,
@@ -230,6 +231,8 @@
         WHERE
         mm.ma_status='2' and sai.is_slt = 0
         AND bp.pro_name is not null
+        AND mm.this_check_time is not null
+        AND mm.next_check_time is not null
         AND mt.jiju_type = 2
         <if test="status != null and status == 0">
             AND mm.next_check_time &gt;= CURDATE()