diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java
index 2e036ea..9591a14 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/GxPlanDto.java
@@ -21,4 +21,7 @@ public class GxPlanDto {
     @ApiModelProperty(value = "关键字")
     private String keyWord;
 
+    @ApiModelProperty(value = "工程类型 变电/线路")
+    private String proType;
+
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
index 536a093..2d3859f 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
@@ -252,16 +252,26 @@
         tgp.end_time AS endTime,
         tgp.dela_reason AS delaReason,
         tgp.bid_code AS bidCode,
-        sd.dict_name AS gxName,
-        IFNULL(sd.dict_name,tpg.gt_name) AS gxName
+        <if test="proType == '变电'">
+            sd.dict_name AS gxName,
+        </if>
+        <if test="proType == '线路'">
+            tpg.gt_name AS gxName,
+        </if>
+        tgp.gx_id AS gxId
         FROM tb_gx_plan tgp
-        LEFT JOIN sys_dict sd ON sd.dict_code = tgp.gx_id
-        LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
+        <if test="proType == '变电'">
+            LEFT JOIN sys_dict sd ON sd.dict_code = tgp.gx_id
+        </if>
+        <if test="proType == '线路'">
+            LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
+        </if>
         WHERE tgp.bid_code = #{bidCode}
-        <if test="keyWord!=null and keyWord!=''">
-            AND (
-                INSTR(tgp.gx_weight,#{keyWord}) > 0
-            )
+        <if test="proType == '变电'">
+           AND INSTR(sd.dict_name,#{keyWord}) > 0
+        </if>
+        <if test="proType == '线路'">
+           AND INSTR(tpg.gt_name,#{keyWord}) > 0
         </if>
     </select>
     <!--工序计划详情-->
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
index e9d5638..2bc7e0f 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
@@ -82,18 +82,26 @@
         tgp.end_time AS endTime,
         tgp.dela_reason AS delaReason,
         tgp.bid_code AS bidCode,
-        sd.dict_name AS gxName,
-        tgp.bid_code AS bidCode,
-        tgp.gx_id AS gxId,
-        IFNULL(sd.dict_name,tpg.gt_name) AS gxName
+        <if test="proType == '变电'">
+            sd.dict_name AS gxName,
+        </if>
+        <if test="proType == '线路'">
+            tpg.gt_name AS gxName,
+        </if>
+        tgp.gx_id AS gxId
         FROM tb_gx_plan tgp
-        LEFT JOIN sys_dict sd ON sd.dict_code = tgp.gx_id
-        LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
+        <if test="proType == '变电'">
+            LEFT JOIN sys_dict sd ON sd.dict_code = tgp.gx_id
+        </if>
+        <if test="proType == '线路'">
+            LEFT JOIN t_pro_gt tpg ON tgp.gx_id = tpg.gt_id
+        </if>
         WHERE tgp.bid_code = #{bidCode}
-        <if test="keyWord!=null and keyWord!=''">
-            AND (
-            INSTR(tgp.gx_weight,#{keyWord}) > 0
-            )
+        <if test="proType == '变电'">
+           AND INSTR(sd.dict_name,#{keyWord}) > 0
+        </if>
+        <if test="proType == '线路'">
+           AND INSTR(tpg.gt_name,#{keyWord}) > 0
         </if>
     </select>
     <!--工序计划延期提醒-->