From e1d243970af6a7b4288acfc9a08847c10b2b85d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Fri, 25 Apr 2025 16:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/search/TbSubController.java     | 18 ++++++++++++++++++
 .../tool/mapper/TbCompanyPerfRelMapper.java    |  5 +++--
 .../com/bonus/tool/mapper/TbSubMapper.java     |  4 +++-
 .../src/main/resources/mapper/TbSubMapper.xml  |  4 ++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java
index 41257a0..f969ee9 100644
--- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java
+++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java
@@ -135,4 +135,22 @@ public class TbSubController extends BaseController {
             log.info("导出失败{}",e.getMessage());
         }
     }
+
+    /**
+     * 分包商列表所有
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "分包商列表所有")
+    //       @PreAuthorize("@ss.hasPermi('key:people:list')")
+    @GetMapping("/getTbSubAll")
+    public TableDataInfo getTbSubAll(TbSubVo tbSubVo) {
+        try {
+            List<TbSubVo> tbSubVoList = tbSubService.getTbSubList(tbSubVo);
+            return getDataTable(tbSubVoList);
+        }catch (Exception e){
+            log.info("分包商列表失败{}",e.getMessage());
+            return  getDataTableError(null);
+        }
+    }
 }
diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java
index b9abbab..fd93af7 100644
--- a/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java
+++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java
@@ -1,13 +1,14 @@
 package com.bonus.tool.mapper;
 
 import com.bonus.tool.dto.TbCompanyPerfRelVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface TbCompanyPerfRelMapper {
-    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId,String source);
+    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(@Param("perfId") Long perfId, @Param("source")String source);
 
     void addTbCompanyPerRel(TbCompanyPerfRelVo tbCompanyPerfRelVo);
 
-    void delTbCompanyPerRelByPerfId(Long perfId,String source);
+    void delTbCompanyPerRelByPerfId(@Param("perfId") Long perfId, @Param("source")String source);
 }
diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java
index e16512e..3893334 100644
--- a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java
+++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java
@@ -9,11 +9,13 @@ public interface TbSubMapper {
 
     TbSubVo getTbSubById(TbSubVo tbSubVo);
 
-    TbSubVo addTbSub(TbSubVo tbSubVo);
+    void addTbSub(TbSubVo tbSubVo);
 
     TbSubVo getTbSubBySubName(TbSubVo tbSubVo);
 
     void updateTbSub(TbSubVo tbSubVo);
 
     void delTbSub(TbSubVo tbSubVo);
+
+
 }
diff --git a/search-tool/src/main/resources/mapper/TbSubMapper.xml b/search-tool/src/main/resources/mapper/TbSubMapper.xml
index b9fc1e0..72529e4 100644
--- a/search-tool/src/main/resources/mapper/TbSubMapper.xml
+++ b/search-tool/src/main/resources/mapper/TbSubMapper.xml
@@ -40,9 +40,9 @@
     </delete>
 
     <select id="getTbSubList" resultType="com.bonus.tool.dto.TbSubVo">
-        select id,sub_name,address,user_name,user_phone,create_time,create_user
+        select id as id,sub_name as subName,address as address,user_name as userName,user_phone as userPhone,create_time,create_user
         from tb_sub where del_flag = 0
-        <if test="subName != '' and subName != null">and sub_name = #{subName}</if>
+        <if test="subName != '' and subName != null">and sub_name  like concat('%', #{subName}, '%')</if>
     </select>
     <select id="getTbSubById" resultType="com.bonus.tool.dto.TbSubVo">
         select id,sub_name,address,user_name,user_phone,create_time,create_user