From 7c0b6191578a9d2858c21fd2cf6662c83e9c0642 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Fri, 20 Jun 2025 13:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E7=BD=91,epc=E5=92=8C=E5=9B=BD?=
 =?UTF-8?q?=E7=BD=91=E4=B8=80=E6=A0=B7,=E5=8F=AA=E5=8F=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/controller/search/StateGridController.java    |  2 +-
 .../src/main/java/com/bonus/tool/dto/TbGwModelDto.java |  6 ++++++
 .../src/main/java/com/bonus/tool/dto/TbGwModelVo.java  |  6 ++++++
 .../src/main/resources/mapper/StateGridMapper.xml      | 10 +++++-----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java
index 402c6c2..7bac864 100644
--- a/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java
+++ b/search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java
@@ -128,7 +128,7 @@ public class StateGridController extends BaseController {
     @PostMapping("/downloadStateGridTemp")
     public void downloadStateGridTemp(HttpServletRequest request, HttpServletResponse response, @RequestBody TbGwModelDto o) {
         try {
-            service.downloadStateGridTemp(request,  response, o);
+            service.downloadStateGridTemp(request, response, o);
         }catch (Exception e){
             log.info("国网模版下载失败{}",e.getMessage());
         }
diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java
index b8d507d..8f8f4cc 100644
--- a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java
+++ b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java
@@ -24,6 +24,12 @@ public class TbGwModelDto implements Serializable {
 	 * 标书名称
 	 */
     private String name;
+
+	/**
+	 * 类型 1.国网  2.EPC 3.南网
+	 */
+	private String type;
+
 	/**
 	 * 创建时间
 	 */
diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java
index 9bcde51..fd01bce 100644
--- a/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java
+++ b/search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java
@@ -24,6 +24,12 @@ public class TbGwModelVo implements Serializable {
 	 * 标书名称
 	 */
     private String name;
+
+	/**
+	 * 类型 1.国网  2.EPC 3.南网
+	 */
+	private String type;
+
 	/**
 	 * 创建时间
 	 */
diff --git a/search-tool/src/main/resources/mapper/StateGridMapper.xml b/search-tool/src/main/resources/mapper/StateGridMapper.xml
index 8af8cfb..f43cf20 100644
--- a/search-tool/src/main/resources/mapper/StateGridMapper.xml
+++ b/search-tool/src/main/resources/mapper/StateGridMapper.xml
@@ -4,10 +4,8 @@
 <mapper namespace="com.bonus.tool.mapper.StateGridMapper">
 
     <insert id="addStateGridTemp" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into tb_gw_model(name,
-                                create_user)
-        values (#{name},
-                #{createUser})
+        insert into tb_gw_model(name,create_user,type)
+        values (#{name},#{createUser},#{type})
     </insert>
     <insert id="insertComPerf">
         insert into tb_gw_perf_rel(
@@ -145,7 +143,9 @@
         create_time,
         update_time
         from
-        tb_gw_model where del_flag =0
+        tb_gw_model
+        where del_flag = 0
+        and type = #{type}
         <if test="name != '' and name != null">
             and locate(#{name},name)
         </if>