From 11c337de5464afd5e4079698254c9bfd7e9ab6f8 Mon Sep 17 00:00:00 2001
From: huangrenya <hry1204@153.com>
Date: Wed, 20 Mar 2024 18:07:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java     | 3 ++-
 .../java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java
index 3a95ed7c..3c6666f0 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java
@@ -62,11 +62,12 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
 
 
     @Select("<script>" +
-            "SELECT  rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, df.dike_name as dikeName, df.river_location as riverLocation,  " +
+            "SELECT  rw.id, rw.NAME, fz.name as groupName, rw.GROUP_ID as groupId, rw.DIKE_CODE as dikeCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, df.dike_name as dikeName, df.river_location as riverLocation,  " +
             "gl.engineering_management_unit as engineeringManagementUnit, df.adcd_start as adcdStart, df.adcd_end as adcdEnd, df.dike_grad as  dikeGrad, df.DIKE_PATT as  dikePatt, df.DIKE_TYPE as dikeType, rw.remark " +
             "FROM bs_sgc_df_bxgcrw rw " +
             "LEFT JOIN bs_sgc_df_gcda df  ON rw.dike_code = df.dike_code " +
             "LEFT JOIN bs_sgc_df_gcgl gl  ON rw.dike_code = gl.dike_code " +
+            "LEFT JOIN bs_sgc_df_bxgcfz fz  ON rw.GROUP_ID = fz.id " +
             "WHERE  df.expr_date is null  " +
             "AND gl.expr_date is null " +
             "<if test='id != null and id != \"\"'>" +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java
index e94586b9..4c51b2a0 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java
@@ -61,11 +61,12 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
 
 
     @Select("<script>" +
-            "SELECT  rw.id, rw.NAME, rw.GROUP_ID as groupId, rw.waga_code as wagaCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, " +
+            "SELECT  rw.id, rw.NAME, fz.name as groupName, rw.GROUP_ID as groupId, rw.waga_code as wagaCode, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.CONTENT as content, rw.state, " +
             "df.waga_name as wagaName,  gl.engineering_management_unit as engineeringManagementUnit, df.adcd as adcd, df.ENG_SCAL as engScal , df.waga_type as wagaType,df.MAIN_BUILD_GRAD as  mainBuildGrad, rw.remark " +
             "FROM bs_sgc_sz_bxgcrw rw " +
             "LEFT JOIN bs_sgc_sz_jbxx df  ON rw.waga_code = df.waga_code " +
             "LEFT JOIN bs_sgc_sz_gcgl gl  ON rw.waga_code = gl.waga_code " +
+            "LEFT JOIN bs_sgc_sz_bxgcfz fz  ON rw.GROUP_ID = fz.id " +
             "WHERE  df.expr_date is null  " +
             "AND gl.expr_date is null " +
             "<if test='id != null and id != \"\"'>" +