From 0ec4e0327f15647c834e242de5b471f6590cfa55 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 17 Jan 2025 14:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/sqldialects.xml                         |  1 +
 .../mappers/business/backstage/ProMapper.xml  | 38 ++++++-------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 07a101b..7405141 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -8,6 +8,7 @@
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/ContractMapper.xml" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/InventoryApplyMapper.xml" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/MaTypeMapper.xml" dialect="GenericSQL" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/ProMapper.xml" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/PurchaseMapper.xml" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/backstage/SupplierMapper.xml" dialect="GenericSQL" />
     <file url="file://$PROJECT_DIR$/src/main/resources/mappers/business/system/SysAuditMapper.xml" dialect="GenericSQL" />
diff --git a/src/main/resources/mappers/business/backstage/ProMapper.xml b/src/main/resources/mappers/business/backstage/ProMapper.xml
index 7dba9e1..5d47545 100644
--- a/src/main/resources/mappers/business/backstage/ProMapper.xml
+++ b/src/main/resources/mappers/business/backstage/ProMapper.xml
@@ -127,31 +127,13 @@
 
     <!--标段工程列表-->
     <select id="getProList" resultType="com.bonus.aqgqj.business.backstage.entity.pro.ProVo">
-        SELECT tbp.id,
-        tbp.bid_id as bidId,
-        tbp.num AS bidNo,
-        tbp.bmname,
-        tbp.name as bdname,
-        tbp.address as constructionsite,
-        tbp.type_id,
-        bpt.`NAME` as projectcategory,
-        tbp.vol_id,
-        bvl.`NAME` as voltagelevel,
-        tbp.starttime,
-        tbp.completiontime,
-        tbp.xmfzr,
-        tbp.gczg,
-        tbp.aqzg,
-        tbp.zlzg,
-        tbp.jyzg,
-        tbp.cwzg,
-        tbp.wlzg,
-        tbp.ngzg,
-        tbp.jjzg,
-        tbp.xm_zt AS xmZt,
-        tbp.dwname,
-        tbp.projectscale,
-        tbp.remarks as remark,
+        SELECT tbp.id, tbp.bid_id as bidId,
+        tbp.num AS bidNo, tbp.bmname, tbp.name as bdname,
+        tbp.address as constructionsite, tbp.type_id,  bpt.`NAME` as projectcategory,
+        tbp.vol_id, bvl.`NAME` as voltagelevel,  tbp.starttime,
+        tbp.completiontime,  tbp.xmfzr,   tbp.gczg, tbp.aqzg, tbp.zlzg,  tbp.jyzg, tbp.cwzg,
+        tbp.wlzg,tbp.ngzg, tbp.jjzg, tbp.xm_zt AS xmZt,
+        tbp.dwname,tbp.projectscale, tbp.remarks as remark,
         CASE tbp.data_source WHEN '1' THEN '施工平台' WHEN '2' THEN '自建' END AS dataSource
         FROM bm_project tbp
         LEFT JOIN bm_project_type bpt ON tbp.type_id = bpt.ID
@@ -159,8 +141,10 @@
         <where>
             <if test="keyWord != null and keyWord != ''">
                 AND (
-                INSTR(tbp.bmname, #{keyWord}) > 0 OR
-                INSTR(tbp.name, #{keyWord}) > 0
+                    INSTR(tbp.bmname, #{keyWord}) > 0 OR
+                    INSTR(tbp.name, #{keyWord}) > 0 OR
+                    INSTR(bvl.`NAME`, #{keyWord}) > 0 OR
+                    INSTR( bpt.`NAME`, #{keyWord}) > 0
                 )
             </if>
             <if test="dataSource != null and dataSource != ''">