From 821e8e6f5651b0f0ed57f2ee666b2b4461a92373 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Fri, 8 Aug 2025 15:42:01 +0800
Subject: [PATCH] 0808

---
 .../inspection/entity/InspectionEquInfo.java  | 15 ++++++++++
 .../inspection/InspectionEquInfoMapper.xml    | 29 ++++++++++++++++++-
 .../framework/web/core/FlowableWebFilter.java | 20 ++-----------
 3 files changed, 46 insertions(+), 18 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 b33abce5..5056477d 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
@@ -73,12 +73,15 @@ public class InspectionEquInfo extends TenantBaseDO
     private Long folderId;
 
     /** 检测证书编号 */
+    @Excel(name = "检测证书编号")
     private String certificateNumber;
 
     /** 制造商 */
+    @Excel(name = "制造商")
     private String manufacturer;
 
     /** 电话 */
+    @Excel(name = "制造商电话")
     private String mobile;
 
     /** 地址 */
@@ -99,4 +102,16 @@ public class InspectionEquInfo extends TenantBaseDO
     /** 服务套餐id */
     private String servicePackageId;
 
+    /** 经销商 */
+    @Excel(name = "经销商")
+    private String dealer;
+
+    /** 经销商电话 */
+    @Excel(name = "经销商电话")
+    private String dealerMobile;
+
+    /** 经销商地址 */
+    @Excel(name = "经销商地址")
+    private String dealerAddr;
+
 }
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 6cbcca35..7a71049e 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionEquInfoMapper.xml
@@ -7,7 +7,7 @@ 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 id="selectInspectionEquInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo">
         select * from inspection_equ_info
         <where>
             deleted = 0
@@ -31,6 +31,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and service_package_id = #{inspectionEquInfo.servicePackageId}
             </if>
         </where>
+        ORDER BY create_time DESC
+    </select>-->
+    <select id="selectInspectionEquInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo">
+        SELECT * FROM inspection_equ_info
+        <where>
+            deleted = 0
+            <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 inspectionEquInfo.params.endNextCheckTime != null and inspectionEquInfo.params.endNextCheckTime != ''">
+                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>
+            <if test="inspectionEquInfo.servicePackageId != null and inspectionEquInfo.servicePackageId != ''">
+                AND service_package_id = #{inspectionEquInfo.servicePackageId}
+            </if>
+        </where>
+        ORDER BY create_time DESC
     </select>
 
     <select id="selectInspectionEquInfoById"  resultType="cn.iocoder.yudao.module.inspection.entity.InspectionEquInfo">
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
index 8959a5d8..7c7ce35d 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/core/FlowableWebFilter.java
@@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.bpm.framework.web.core;
 
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
@@ -19,8 +17,6 @@ import java.io.IOException;
  */
 public class FlowableWebFilter extends OncePerRequestFilter {
 
-    private static final Logger log = LoggerFactory.getLogger(FlowableWebFilter.class);
-
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {
@@ -28,24 +24,14 @@ public class FlowableWebFilter extends OncePerRequestFilter {
             // 设置工作流的用户
             Long userId = SecurityFrameworkUtils.getLoginUserId();
             if (userId != null) {
-                try {
-                    FlowableUtils.setAuthenticatedUserId(userId);
-                } catch (Exception e) {
-                    // 忽略设置用户 ID 时的异常，避免影响主流程
-                    log.warn("设置 Flowable 认证用户 ID 失败", e);
-                }
+                FlowableUtils.setAuthenticatedUserId(userId);
             }
             // 过滤
             chain.doFilter(request, response);
         } finally {
             // 清理
-            try {
-                FlowableUtils.clearAuthenticatedUserId();
-            } catch (Exception e) {
-                // 忽略清理时的异常
-                log.warn("清理 Flowable 认证用户 ID 失败", e);
-            }
+            FlowableUtils.clearAuthenticatedUserId();
         }
     }
 
-}
\ No newline at end of file
+}