From 3bb5647ce4459df9dba14b0e84c72f3899ea1c1b Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 27 Aug 2024 23:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9F=A5=E8=AF=A2=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdxt/code/domain/EnterpriseInformation.java   | 15 +++++++++++++++
 .../mapper/EnterpriseInformationMapper.xml        |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
index c91a23c1..f30bff84 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
@@ -97,6 +97,11 @@ public class EnterpriseInformation extends BaseDomain
     // 临时字段 - 补录原因
     private String reason;
 
+    /**
+     * 综合搜索字段
+     */
+    private String searchValue;
+
     public String getReason() {
         return reason;
     }
@@ -287,6 +292,16 @@ public class EnterpriseInformation extends BaseDomain
         this.operatingTermEnd = operatingTermEnd;
     }
 
+    @Override
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    @Override
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
index 063a22ed..3fc6d048 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
@@ -57,6 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  #{enterpriseNumber}
              </foreach>
             </if>
+            <if test="searchValue != null and searchValue != ''">
+                or enterprise_name like concat('%', #{searchValue}, '%')
+                or enterprise_number like concat('%', #{searchValue}, '%')
+            </if>
             and is_delete = 0
         </where>
         order by create_time desc