From 3d1f02c07e017197bb62b0c5d973a6b8f0b531f9 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 18 Mar 2024 10:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/system/base/dto/GxPlanDto.java | 3 ++
.../main/resources/mapper/base/ProMapper.xml | 26 +++++++++++------
.../mapper/base/ProScheduleMapper.xml | 28 ++++++++++++-------
3 files changed, 39 insertions(+), 18 deletions(-)
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
+
+ sd.dict_name AS gxName,
+
+
+ tpg.gt_name AS gxName,
+
+ 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
+
+ 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
+
WHERE tgp.bid_code = #{bidCode}
-
- AND (
- INSTR(tgp.gx_weight,#{keyWord}) > 0
- )
+
+ AND INSTR(sd.dict_name,#{keyWord}) > 0
+
+
+ AND INSTR(tpg.gt_name,#{keyWord}) > 0
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
+
+ sd.dict_name AS gxName,
+
+
+ tpg.gt_name AS gxName,
+
+ 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
+
+ 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
+
WHERE tgp.bid_code = #{bidCode}
-
- AND (
- INSTR(tgp.gx_weight,#{keyWord}) > 0
- )
+
+ AND INSTR(sd.dict_name,#{keyWord}) > 0
+
+
+ AND INSTR(tpg.gt_name,#{keyWord}) > 0