From e1c3cbab1dfa50452a30697bd7fae9c0037fe570 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Thu, 6 Aug 2026 09:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=85=A8=E5=B8=82=E6=9C=AC=E5=8D=95=E4=BD=8D=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnforcementRegistrationServiceImpl.java   |  9 ++++---
 .../EnforcementRegistrationMapper.xml         | 25 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
index 3c1ac1ec..3e40118b 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java
@@ -103,10 +103,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
      */
     @Override
     public TableDataInfo<EnforcementRegistrationVo> queryPageList(EnforcementRegistrationBo bo, PageQuery pageQuery) {
-        // 使用App端专用的查询条件构建器
-        LambdaQueryWrapper<EnforcementRegistration> lqw = buildAppListQueryWrapper(bo);
-        Page<EnforcementRegistrationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+        // 使用自定义XML查询，包含num字段（企业执法次数）
+        Page<EnforcementRegistrationVo> page = pageQuery.build();
+        List<EnforcementRegistrationVo> list = baseMapper.selectEnforcementRegistrationList(bo, page);
+        page.setRecords(list);
+        return TableDataInfo.build(page);
     }
 
     /**
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
index 8cf23ae8..8c761359 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
@@ -548,7 +548,27 @@
                     AND er.has_auto = #{bo.hasAuto}
                 </if>
                 <if test="bo.searchValue != null and bo.searchValue != ''">
-                    AND er.enterprise_name LIKE CONCAT('%', #{bo.searchValue}, '%')
+                    AND (
+                        er.enterprise_name LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.enterprise_number LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.enterprise_address LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement_code LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.bureau_dept_name LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcer LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcer_two LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement_item_text LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement_basis LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR DATE_FORMAT(er.enforcement_time, '%Y-%m-%d') LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.check_css LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.check_category LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.enforce_reason LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.remark LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement_basis_text LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_text LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.enforce LIKE CONCAT('%', #{bo.searchValue}, '%')
+                        OR er.law_enforcement_item LIKE CONCAT('%', #{bo.searchValue}, '%')
+                    )
                 </if>
                 <if test="bo.dateSearch != null and bo.dateSearch != ''">
                     AND er.enforcement_time &gt;= CONCAT(#{bo.dateSearch}, '-01')
@@ -581,6 +601,9 @@
                 <if test="bo.bureauDeptId != null and bo.bureauDeptId != ''">
                     AND er.bureau_dept_id = #{bo.bureauDeptId}
                 </if>
+                <if test="bo.lawEnforcementId != null and bo.lawEnforcementId != ''">
+                    AND er.law_enforcement_id = #{bo.lawEnforcementId}
+                </if>
             </where>
         ) t
         <where>