From 30281c601b8a6ca067d1ba5fef5408430eb42b97 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Mon, 25 Mar 2024 18:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BsSgcYxjdEnterpriseInfoMapper.java       |  4 ++++
 .../service/BsSgcYxjdEnterpriseInfoService.java     | 10 +++++++++-
 .../earlyStage/SpecialProjectPreDesignMapper.xml    |  2 +-
 .../enterprise/BsSgcYxjdEnterpriseInfoMapper.xml    | 13 +++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
index d4690809..0eacac03 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java
@@ -40,4 +40,8 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
                                              @Param("orderBy") String createTime,
                                              Page<Object> objectPage);
 
+    IPage<BsSgcYxjdEnterpriseInfo> listProject(@Param("adcd") String subString,
+                                               @Param("enterpriseName") String enterpriseName,
+                                               Page page);
+
 }
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
index f9f48437..1f279f2f 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
@@ -9,6 +9,7 @@ import com.jianwei.common.core.domain.entity.SysUser;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
+import com.kms.earlyStage.domain.SpecialProjectPreDesign;
 import com.kms.enterprise.domain.dto.AreaDto;
 import com.kms.enterprise.domain.dto.CreditDto;
 import com.kms.enterprise.domain.dto.DisclosureDto;
@@ -157,7 +158,14 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
 
     public IPage<BsSgcYxjdEnterpriseInfo> listEnterprise(SearchParam<BsSgcYxjdEnterpriseInfo> sp) {
 
+        BsSgcYxjdEnterpriseInfo data = sp.getData();
+
+
+        IPage<BsSgcYxjdEnterpriseInfo> page=bsSgcYxjdEnterpriseInfoMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getEnterpriseName(),
+                new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+
+        return page;
 
-        return null;
     }
 }
diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
index 829279aa..ec380ebd 100644
--- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
@@ -91,7 +91,7 @@
         <result property="proNo" column="pro_no"/>
     </resultMap>
 
-    <select id="listProject" resultType="com.kms.earlyStage.domain.SpecialProjectPreDesign">
+    <select id="listProject" resultMap="listProject">
         select pi.id,
                pp.project_name,
                pi.pro_code,
diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
index 45dacac8..36250bdf 100644
--- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
@@ -115,6 +115,19 @@
         </if>
 
     </select>
+    <select id="listProject" resultMap="EnterpriseInfo">
+        select * from bs_sgc_yxjd_enterprise_info
+        <where>
+
+            <if test="enterpriseName!=null and enterpriseName!=''">
+                and enterprise_name like concat('%',#{enterpriseName},'%')
+            </if>
+            <if test="adcd!=null and adcd !=''">
+                and adcd like concat(#{adcd},'%')
+            </if>
+        </where>
+        order by ${orderBy} desc
+    </select>
 
 
 </mapper>