功能优化

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;
+
     /**
      * 下次检验日期
      */

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>

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()