From 24ce3494f6110c26909fae5b693d73cd5b7600ad Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 21 Jul 2025 18:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnterpriseInformationController.java   |  5 ++--
 .../code/domain/EnterpriseInformation.java    | 21 +++++++++++++++
 .../mapper/EnterpriseInformationMapper.java   |  1 +
 .../IEnterpriseInformationService.java        |  2 ++
 .../EnterpriseInformationServiceImpl.java     |  6 +++++
 .../mapper/EnterpriseInformationMapper.xml    | 26 ++++++++++++++++---
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
index ef78819e..21b2f454 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
@@ -78,9 +78,10 @@ public class AppEnterpriseInformationController extends BaseController
     {
 //        startPage();
         List<EnterpriseInformation> list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation);
+        int count = enterpriseInformationService.selectEnterpriseInformationAndQrInfoCount(enterpriseInformation);
 //        return getDataTable(list);
-        long total = Math.min(list.size(), 60);
-        TableDataInfo rspData = getDataTable(list);
+        long total = Math.min(count, 60);
+        TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(0);
         rspData.setRows(list);
         rspData.setTotal(total);
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 959ecbf2..623c0170 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
@@ -113,6 +113,11 @@ public class EnterpriseInformation extends BaseDomain
 
     private String qy;
 
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+
     public String getReason() {
         return reason;
     }
@@ -370,4 +375,20 @@ public class EnterpriseInformation extends BaseDomain
             .append("createBy", getCreateBy())
             .toString();
     }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
index dbbdae7f..048f2dd5 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
@@ -44,6 +44,7 @@ public interface EnterpriseInformationMapper
      * @return
      */
     List<EnterpriseInformation> selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation);
+    int selectEnterpriseInformationAndQrInfoCount(String searchValue,String enterpriseName);
 
     /**
      * 新增企业信息登记
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
index ae804bea..2ce54fab 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
@@ -56,6 +56,8 @@ public interface IEnterpriseInformationService
      */
     List<EnterpriseInformation> selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation);
 
+    int selectEnterpriseInformationAndQrInfoCount(EnterpriseInformation enterpriseInformation);
+
     /**
      * 新增企业信息登记
      * 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
index 8ac9b340..927dd810 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
@@ -259,6 +259,12 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
         return enterpriseInformationMapper.selectEnterpriseInformationAndQrInfo(enterpriseInformation);
     }
 
+    @Override
+    public int selectEnterpriseInformationAndQrInfoCount(EnterpriseInformation enterpriseInformation) {
+        return enterpriseInformationMapper.selectEnterpriseInformationAndQrInfoCount(
+                enterpriseInformation.getSearchValue(),enterpriseInformation.getEnterpriseName());
+    }
+
     /**
      * 新增企业信息登记
      *
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
index 54ff6321..4ee269ce 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
@@ -130,9 +130,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             </where>
             ORDER BY ei.create_time DESC
-        <if test="params.pageNum != null and params.pageSize != null"><!-- 开始时间检索 -->
-            LIMIT #{params.pageNum}, #{params.pageSize}
-        </if>
+<!--        <if test="pageNum != null and pageSize != null">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
+<!--            LIMIT #{pageNum}, #{pageSize}-->
+<!--        </if>-->
+    </select>
+
+    <select id="selectEnterpriseInformationAndQrInfoCount"  resultType="int">
+        SELECT
+         count(1)
+        FROM
+        enterprise_information ei
+        <where>
+            and ei.is_delete = 0
+            <if test="searchValue != null and searchValue != ''">
+                AND (ei.enterprise_name like concat('%', #{searchValue}, '%')
+                or ei.enterprise_number like concat('%', #{searchValue}, '%'))
+            </if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and ei.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+
+        </where>
+        ORDER BY ei.create_time DESC
+        <!--        <if test="pageNum != null and pageSize != null">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
+        <!--            LIMIT #{pageNum}, #{pageSize}-->
+        <!--        </if>-->
     </select>
 
     <select id="selectEnterpriseInformationById" parameterType="String" resultMap="EnterpriseInformationResult">