From 2fbbcb0daa37486266c181a0717afdf35094a374 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 17 Dec 2024 16:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/entity/InspectionEquInfo.java  |  3 +++
 .../inspection/InspectionEquInfoMapper.xml    | 21 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java
index cc27e940..be2275e7 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionEquInfo.java
@@ -62,4 +62,7 @@ public class InspectionEquInfo extends TenantBaseDO
     @TableField(exist = false)
     private Map<String,Object> params;
 
+    /** 设备类别(字典：ins_equ_type) */
+    private String type;
+
 }
diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml
index 19d015dc..0c015507 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml
@@ -8,13 +8,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectInspectionEquInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo">
-        select  * from inspection_equ_info
+        select * from inspection_equ_info
         <where>
-            <if test="inspectionEquInfo.equName != null  and inspectionEquInfo.equName != ''"> and equ_name like concat('%', #{inspectionEquInfo.equName}, '%')</if>
-            <if test="inspectionEquInfo.equModel != null  and inspectionEquInfo.equModel != ''"> and equ_model like concat('%', #{inspectionEquInfo.equModel}, '%')</if>
-            <if test="inspectionEquInfo.equNumber != null  and inspectionEquInfo.equNumber != ''"> and equ_number like concat('%', #{inspectionEquInfo.equNumber}, '%')</if>
+            <if test="inspectionEquInfo.equName != null  and inspectionEquInfo.equName != ''">and equ_name like
+                concat('%', #{inspectionEquInfo.equName}, '%')
+            </if>
+            <if test="inspectionEquInfo.equModel != null  and inspectionEquInfo.equModel != ''">and equ_model like
+                concat('%', #{inspectionEquInfo.equModel}, '%')
+            </if>
+            <if test="inspectionEquInfo.equNumber != null  and inspectionEquInfo.equNumber != ''">and equ_number like
+                concat('%', #{inspectionEquInfo.equNumber}, '%')
+            </if>
             <if test="inspectionEquInfo.params.beginNextCheckTime != null and inspectionEquInfo.params.beginNextCheckTime != '' and params.endNextCheckTime != null and params.endNextCheckTime != ''">
-                  and next_check_time between #{inspectionEquInfo.params.beginNextCheckTime} and #{inspectionEquInfo.params.endNextCheckTime}</if>
+                and next_check_time between #{inspectionEquInfo.params.beginNextCheckTime} and
+                #{inspectionEquInfo.params.endNextCheckTime}
+            </if>
+            <if test="inspectionEquInfo.type != null and inspectionEquInfo.type != ''">
+                and `type` = #{inspectionEquInfo.type}
+            </if>
         </where>
     </select>