diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
index fef24b0e..38a01437 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
@@ -30,7 +30,7 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "and waga_name like concat('%', #{dto.wagaName}, '%') ",
             "</if>",
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
-            "and  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(WAGA_TYPE, '[', ''), ']', ''), '\"', '')) ",
+            "and  WAGA_TYPE = #{dto.wagaType}  ",
             "</if>",
             "<if test='dto.adcd!= null and dto.adcd != \"\"'>",
             "and adcd = #{dto.adcd} ",
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
index 4570746d..51f2e7e2 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java
@@ -51,13 +51,13 @@ public interface DfDangerousTaskItemRelMapper extends BaseMapper<DfDangerousTask
             "</if>" +
             "WHERE xx.expr_date is null  " +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.DIKE_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  xx.dike_type = #{dto.dikeType}  " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND rw.id = #{dto.id} " +
             "</if>" +
             "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
-            "AND xx.river_location = #{dto.riverLocation} " +
+            "AND xx.DIKE_RIVER = #{dto.riverLocation} " +
             "</if>" +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
             "AND (xx.ADCD_START = #{dto.adcdStart}  OR xx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
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 e5246d65..a263c43d 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
@@ -24,13 +24,11 @@ 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, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, " +
-            "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 , fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark,rw.FINISH_TIME as finishTime  " +
+            "df.dike_name as dikeName, df.DIKE_RIVER as riverLocation,  df adm_dep as engineeringManagementUnit, df.adcd as adcdStart, fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark,rw.FINISH_TIME as finishTime  " +
             "FROM bs_sgc_df_bxgcrw rw " +
-            "LEFT JOIN bs_sgc_df_gcda df  ON df.dike_code = rw.dike_code " +
-            "LEFT JOIN bs_sgc_df_gcgl gl  ON gl.dike_code = rw.dike_code " +
+            "LEFT JOIN att_dike_base df  ON df.dike_code = rw.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='dto.taskName != null and dto.taskName != \"\"'>" +
             "AND rw.name LIKE CONCAT('%', #{dto.taskName}, '%') " +
             "</if>" +
@@ -38,19 +36,16 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
             "AND df.dike_name LIKE CONCAT('%', #{dto.dikeName}, '%') " +
             "</if>" +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(df.DIKE_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  df.dike_type = #{dto.dikeType}  " +
             "</if>" +
             "<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>" +
             "AND df.dike_grad = #{dto.dikeGrad} " +
             "</if>" +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND df.adcd_start = #{dto.adcdStart} " +
-            "</if>" +
-            "<if test='dto.adcdEnd != null and dto.adcdEnd != \"\"'>" +
-            "AND df.adcd_end = #{dto.adcdEnd} " +
+            "AND df.adcd = #{dto.adcdStart} " +
             "</if>" +
             "<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>" +
-            "AND gl.engineering_management_unit like concat('%', #{dto.engineeringManagementUnit}, '%')  " +
+            "AND df.adm_dep like concat('%', #{dto.engineeringManagementUnit}, '%')  " +
             "</if>" +
             "<if test='dto.dikePatt != null and dto.dikePatt != \"\"'>" +
             "AND df.DIKE_PATT = #{dto.dikePatt} " +
@@ -73,14 +68,12 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
 
 
     @Select("<script>" +
-            "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 " +
+            "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.DIKE_RIVER as riverLocation,  " +
+            "df.adm_dep as engineeringManagementUnit, df.adcd as adcdStart, 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 att_dike_base df  ON rw.dike_code = df.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 != \"\"'>" +
             "AND rw.id = #{id} " +
             "</if>" +
@@ -89,23 +82,22 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
 
     @Select({
             "<script>",
-            "select df.dike_code dike_code, df.dike_name dike_name, df.dike_grad, df.dike_type, df.dike_len,df.dike_patt,df.adcd_start, df.adcd_end, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department ",
-            "from bs_sgc_df_gcda df ",
-            "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
+            "select df.dike_code dike_code, df.dike_name dike_name, df.dike_grad, df.dike_type, df.dike_len,df.dike_patt,df.adcd, df.adm_dep engineering_management_unit,aqjd.identify_time, aqjd.security_category, aqjd.safety_appraisal_opinion",
+            "from att_dike_base df ",
             "left join bs_sgc_df_aqjdxx aqjd on aqjd.dfrw_id = df.id ",
             "where 1=1 ",
             "and df.expr_date is null ",
             "<if test='dto.dikeName != null  and dto.dikeName != \"\"'>",
-            "and dike_name like concat('%', #{dto.dikeName}, '%') ",
+            "and df.dike_name like concat('%', #{dto.dikeName}, '%') ",
             "</if>",
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>",
-            "and dike_type = #{dto.dikeType} ",
+            "and df.dike_type = #{dto.dikeType} ",
             "</if>",
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>",
-            "and adcd_start = #{dto.adcdStart} ",
+            "and df.adcd = #{dto.adcdStart} ",
             "</if>",
             "<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>",
-            "and pj.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%') ",
+            "and df.adm_dep LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%') ",
             "</if>",
             "</script>"
     })
@@ -115,7 +107,6 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
             @Result(property = "dikeGrad", column = "dike_grad"),
             @Result(property = "dikePatt", column = "dike_patt"),
             @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
-            @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
             @Result(property = "identifyTime", column = "identify_time"),
             @Result(property = "securityCategory", column = "security_category"),
             @Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"),
@@ -125,43 +116,43 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
 
 
     @Select("<script>" +
-            "SELECT (SELECT COUNT(DISTINCT jr.dike_code) FROM bs_sgc_df_bxgcrw jr LEFT JOIN bs_sgc_df_gcda jx ON jr.dike_code = jx.dike_code " +
+            "SELECT (SELECT COUNT(DISTINCT jr.dike_code) FROM bs_sgc_df_bxgcrw jr LEFT JOIN att_dike_base jx ON jr.dike_code = jx.dike_code " +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " +
             "</if>" +
             "where jx.EXPR_DATE IS NULL " +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND (jx.ADCD_START = #{dto.adcdStart}  OR jx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
-            " or jx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
+            "AND (jx.adcd = #{dto.adcdStart}  OR jx.adcd in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
+            " or jx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
             "</if>" +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(jx.DIKE_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND   jx.dike_type = #{dto.dikeType}  " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND jr.id = #{dto.id} " +
             "</if>" +
             "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
-            "AND jx.river_location = #{dto.riverLocation} " +
+            "AND jx.DIKE_RIVER = #{dto.riverLocation} " +
             "</if>" +
             ") as alreadyCheckTask, " +
-            "(SELECT COUNT(*) FROM bs_sgc_df_gcda jx " +
+            "(SELECT COUNT(*) FROM att_dike_base jx " +
             "LEFT JOIN bs_sgc_df_bxgcrw rw ON rw.dike_code = jx.dike_code "+
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " +
             "</if>" +
             " WHERE jx.dike_code NOT IN (SELECT dike_code FROM bs_sgc_df_bxgcrw) and jx.EXPR_DATE IS NULL " +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND (jx.ADCD_START = #{dto.adcdStart}  OR jx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
-            " or jx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
+            "AND (jx.adcd = #{dto.adcdStart}  OR jx.adcd in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
+            " or jx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND rw.id = #{dto.id} " +
             "</if>" +
             "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
-            "AND jx.river_location = #{dto.riverLocation} " +
+            "AND jx.DIKE_RIVER = #{dto.riverLocation} " +
             "</if>" +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(jx.DIKE_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND   jx.dike_type = #{dto.dikeType}  " +
             "</if>" +
             ") as unCheckTask  from dual" +
             "</script>")
@@ -170,23 +161,23 @@ public interface DfDangerousTaskMapper extends BaseMapper<DfDangerousTask> {
     @Select("<script>" +
             "SELECT count(*) totalTask,  sum(IF(rw.STATE ='0', 1, 0))+sum(if(rw.state is null,1,0)) unTask, sum(IF(rw.STATE ='1', 1, 0)) finishTask "+
             "FROM bs_sgc_df_bxgcrw rw " +
-            "LEFT JOIN bs_sgc_df_gcda xx  ON xx.dike_code = rw.dike_code " +
+            "LEFT JOIN att_dike_base xx  ON xx.dike_code = rw.dike_code " +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " +
             "</if>" +
             "WHERE xx.expr_date is null  " +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.DIKE_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  xx.dike_type = #{dto.dikeType}   " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND rw.id = #{dto.id} " +
             "</if>" +
             "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
-            "AND xx.river_location = #{dto.riverLocation} " +
+            "AND xx.DIKE_RIVER = #{dto.riverLocation} " +
             "</if>" +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND (xx.ADCD_START = #{dto.adcdStart}  OR xx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
-            " or xx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
+            "AND (xx.adcd = #{dto.adcdStart}  OR xx.adcd in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
+            " or xx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
             "</if>" +
             "</script>")
     DfDangerousTotalDto selectCountByTaskTotal(@Param("dto") DfDangerousTaskSearchDto dto);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java
index ac3072cb..2846df01 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java
@@ -55,15 +55,13 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
     class DfSuperviseProblemProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.DIKE_CODE as dikeCode, xx.DIKE_NAME as dikeName," +
-                        "xx.engineering_management_unit as engineeringManagementUnit,xx.ADCD_START as adcdStart, xx.ADCD_END as adcdEnd,wt.level, wt.status");
+                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.DIKE_CODE as dikeCode, xx.DIKE_NAME as dikeName,xx.adm_dep as engineeringManagementUnit,wt.level, wt.status");
                 FROM("bs_sgc_df_jdjcgcwt wt");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxm xm on wt.project_id = xm.id");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxmnr nr on wt.project_item_id = nr.id");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.DIKE_CODE,xx.DIKE_NAME,xx.ADCD_START,xx.ADCD_END,xx.adcd,gl.engineering_management_unit " +
-                        " FROM bs_sgc_df_gcda xx LEFT OUTER JOIN bs_sgc_df_gcgl gl ON xx.dike_code = gl.dike_code " +
-                        " WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.dike_code = xx.DIKE_CODE");
+                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.DIKE_CODE,xx.DIKE_NAME,xx.adcd,xx.adm_dep " +
+                        " FROM att_dike_base xx  WHERE xx.EXPR_DATE IS NULL ) xx ON rw.dike_code = xx.DIKE_CODE");
                 WHERE("1=1");
                 WHERE("rw.state =1");
 
@@ -75,7 +73,7 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
                     }
                     // 管理单位
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("xx.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.adm_dep LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     // 工程对象
                     if (StringUtils.isNotBlank(dto.getDikeName())) {
@@ -98,13 +96,6 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
         }
     }
 
-    // 判断bs_sgc_df_gcda的adcdStart是否等于sys_xzqh的xzqhdm，或者是否等于xzqhdm的parentid，以及根据parentId获取xzqhdm查询是否等于adcdStart
-
-
-
-
-
-
     /**
      * 监督检查任务统计分析
      * @param dto
@@ -116,13 +107,13 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
             "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious "+
             "FROM bs_sgc_df_jdjcgcwt wt " +
             "LEFT JOIN bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id " +
-            "LEFT JOIN bs_sgc_df_gcda xx on xx.dike_code = rw.dike_code " +
+            "LEFT JOIN att_dike_base xx on xx.dike_code = rw.dike_code " +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " +
             "</if>" +
             "WHERE xx.EXPR_DATE IS NULL   " +
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.dike_type, '[', ''), ']', ''), '\"', '')) " +
+            "AND  xx.dike_type = #{dto.dikeType}  " +
             "</if>" +
             "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
             "AND xx.river_location = #{dto.riverLocation} " +
@@ -131,8 +122,8 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
             "AND wt.task_id = #{dto.taskId}  " +
             "</if>" +
             "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
-            "AND (xx.ADCD_START = #{dto.adcdStart}  OR xx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
-            " or xx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
+            "AND (xx.adcd = #{dto.adcdStart}  OR xx.adcd in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
+            " or xx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
             "</if>" +
             "</script>")
     DfSuperviseProblemTotalDto countProblemTotal(@Param("dto") DfSuperviseProblemListDto dto);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java
index 077c5123..d246af9e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java
@@ -37,12 +37,10 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
     class DfSuperviseTaskProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.DIKE_NAME as dikeName,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit," +
+                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.DIKE_NAME as dikeName,xx.adm_dep as engineeringManagementUnit," +
                         "rw.dike_code as dikeCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.state ");
                 FROM("bs_sgc_df_jdjcrw rw");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcda xx ON xx.dike_code = rw.dike_code");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl on xx.dike_code = gl.dike_code ");
-                WHERE("gl.EXPR_DATE is null");
+                LEFT_OUTER_JOIN("att_dike_base xx ON xx.dike_code = rw.dike_code");
                 WHERE("xx.EXPR_DATE is null");
                 if (param.get("dto") != null) {
                     DfSuperviseTaskDto dto = (DfSuperviseTaskDto) param.get("dto");
@@ -53,7 +51,7 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
                         WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')");
                     }
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.adm_dep like concat('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     if(StringUtils.isNotBlank(dto.getDikeName())){
                         WHERE("xx.dike_name LIKE CONCAT('%',#{dto.dikeName},'%')");
@@ -76,14 +74,12 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
     class DfSuperviseTaskDetailProvider {
         public String selectTaskInfo(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime,rw.weather,rw.inspectors,xx.DIKE_NAME as dikeName,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit,rw.state,rw.content," +
+                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime,rw.weather,rw.inspectors,xx.DIKE_NAME as dikeName,xx.adm_dep as engineeringManagementUnit,rw.state,rw.content," +
                         "rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime,rw.PATROL_UID as patrolUid, rw.PATROL_NAME as patrolName," +
                         "xx.DIKE_NAME as dikeName, xx.DIKE_CODE as dikeCode, xx.DIKE_TYPE as dikeType, " +
                         "(SELECT GROUP_CONCAT(user_name) FROM sys_user tr WHERE FIND_IN_SET(tr.id,(SELECT INSPECTORS FROM bs_sgc_sz_jdjcrw WHERE id=rw.id))) AS inspectorsName");
                 FROM("bs_sgc_df_jdjcrw rw");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcda xx ON xx.dike_code = rw.dike_code");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl ON gl.dike_code = xx.dike_code");
-                WHERE("gl.EXPR_DATE is null");
+                LEFT_OUTER_JOIN("att_dike_base xx ON xx.dike_code = rw.dike_code");
                 WHERE("xx.EXPR_DATE is null");
                 DfSuperviseTaskDto dto = (DfSuperviseTaskDto) param.get("dto");
                 if (dto != null) {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java
index a1fb9bba..3d5d6f68 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java
@@ -44,13 +44,13 @@ public interface SzDangerousTaskItemRelMapper extends BaseMapper<SzDangerousTask
             "SELECT count(*) itemTotal, sum(IF(gl.level ='0', 1, 0))  normalTotal, sum(IF(gl.level ='1', 1, 0)) problemTotal "+
             "FROM bs_sgc_sz_bxgcnrgl gl " +
             "LEFT JOIN bs_sgc_sz_bxgcrw rw on gl.TASK_ID = rw.id " +
-            "LEFT JOIN bs_sgc_sz_jbxx xx  ON xx.waga_code = rw.waga_code " +
+            "LEFT JOIN att_waga_base xx  ON xx.waga_code = rw.waga_code " +
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
             "</if>" +
             "WHERE xx.expr_date is null  " +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  xx.waga_type =  #{dto.wagaType}  " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND rw.id = #{dto.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 509575df..babf4e1e 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
@@ -24,13 +24,11 @@ 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, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime, " +
-            "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, fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark ,rw.FINISH_TIME as finishTime " +
+            "df.waga_name as wagaName,  df.adm_dep as engineeringManagementUnit, df.adcd as adcd, df.ENG_SCAL as engScal , df.waga_type as wagaType, fz.name as groupName, if(rw.remark is null, '0', rw.remark) remark ,rw.FINISH_TIME as finishTime " +
             "FROM bs_sgc_sz_bxgcrw rw " +
-            "LEFT JOIN bs_sgc_sz_jbxx df  ON df.waga_code = rw.waga_code " +
-            "LEFT JOIN bs_sgc_sz_gcgl gl  ON rw.waga_code = gl.waga_code " +
+            "LEFT JOIN att_waga_base df  ON df.waga_code = rw.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='dto.taskName != null and dto.taskName != \"\"'>" +
             "AND rw.name LIKE CONCAT('%', #{dto.taskName}, '%') " +
             "</if>" +
@@ -38,13 +36,13 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             "AND df.waga_name LIKE CONCAT('%', #{dto.wagaName}, '%') " +
             "</if>" +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(df.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  df.waga_type =  #{dto.wagaType}  " +
             "</if>" +
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "AND df.adcd = #{dto.adcd} " +
             "</if>" +
             "<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>" +
-            "AND gl.engineering_management_unit like concat('%', #{dto.engineeringManagementUnit}, '%')  " +
+            "AND df.adm_dep like concat('%', #{dto.engineeringManagementUnit}, '%')  " +
             "</if>" +
             "<if test='dto.engScal != null and dto.engScal != \"\"'>" +
             "AND df.ENG_SCAL = #{dto.engScal} " +
@@ -71,13 +69,11 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
 
     @Select("<script>" +
             "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 " +
+            "df.waga_name as wagaName,  df.adm_dep 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 att_waga_base df  ON rw.waga_code = df.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 != \"\"'>" +
             "AND rw.id = #{id} " +
             "</if>" +
@@ -86,24 +82,22 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
 
     @Select({
             "<script>",
-            "select df.waga_code waga_code, df.waga_name waga_name, df.waga_type, df.adcd, df.eng_scal, pj.engineering_management_unit engineering_management_unit, pj.water_administrative_department water_administrative_department, ",
-            "aqjd.identify_time ,aqjd.security_category, aqjd.safety_appraisal_opinion,df.main_build_grad  ",
-            "from bs_sgc_sz_jbxx df ",
-            "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and pj.expr_date is null ",
+            "select df.waga_code waga_code, df.waga_name waga_name, df.waga_type, df.adcd, df.eng_scal, df.adm_dep engineering_management_unit,df.main_build_grad,aqjd.identify_time ,aqjd.security_category, aqjd.safety_appraisal_opinion ",
+            "from att_waga_base df ",
             "left join bs_sgc_sz_aqjdxx aqjd on aqjd.szrw_id = df.id  ",
             "where 1=1 ",
             "and df.expr_date is null ",
             "<if test='dto.wagaName != null and dto.wagaName != \"\"'>",
-            "and waga_name like concat('%', #{dto.wagaName}, '%') ",
+            "and df.waga_name like concat('%', #{dto.wagaName}, '%') ",
             "</if>",
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
-            "and waga_type = #{dto.wagaType} ",
+            "and df.waga_type = #{dto.wagaType} ",
             "</if>",
             "<if test='dto.adcd!= null and dto.adcd != \"\"'>",
-            "and adcd = #{dto.adcd} ",
+            "and df.adcd = #{dto.adcd} ",
             "</if>",
             "<if test='dto.engineeringManagementUnit != null and dto.engineeringManagementUnit != \"\"'>",
-            "and pj.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%') ",
+            "and df.adm_dep LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%') ",
             "</if>",
             "</script>"
     })
@@ -113,7 +107,6 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             @Result(property = "engScal", column = "eng_scal"),
             @Result(property = "mainBuildGrad", column = "main_build_grad"),
             @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
-            @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
             @Result(property = "identifyTime", column = "identify_time"),
             @Result(property = "securityCategory", column = "security_category"),
             @Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"),
@@ -122,7 +115,7 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
     IPage<SzAqjdProjecDto> selectByAqjdPage(Page<SzAqjdProjecDto> page, @Param("dto") SzAqjdProjecDto dto);
 
     @Select("<script>" +
-            "SELECT (SELECT COUNT(DISTINCT jr.waga_code) FROM bs_sgc_sz_bxgcrw jr LEFT JOIN bs_sgc_sz_jbxx jx ON jr.WAGA_CODE = jx.WAGA_CODE " +
+            "SELECT (SELECT COUNT(DISTINCT jr.waga_code) FROM bs_sgc_sz_bxgcrw jr LEFT JOIN att_waga_base jx ON jr.WAGA_CODE = jx.WAGA_CODE " +
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
             "</if>" +
@@ -132,13 +125,13 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             " or jx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcd}))) " +
             "</if>" +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(jx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  jx.waga_type =  #{dto.wagaType}  " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND jr.id = #{dto.id} " +
             "</if>" +
             ") as alreadyCheckTask, " +
-            "(SELECT COUNT(*) FROM bs_sgc_sz_jbxx jx " +
+            "(SELECT COUNT(*) FROM att_waga_base jx " +
             "LEFT JOIN bs_sgc_sz_bxgcrw rw ON rw.WAGA_CODE = jx.WAGA_CODE "+
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
@@ -152,7 +145,7 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
             "AND rw.id = #{dto.id} " +
             "</if>" +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(jx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND  jx.waga_type =  #{dto.wagaType} " +
             "</if>" +
             ") as unCheckTask  from dual" +
             "</script>")
@@ -161,13 +154,13 @@ public interface SzDangerousTaskMapper extends BaseMapper<SzDangerousTask> {
     @Select("<script>" +
             "SELECT count(*) totalTask,  sum(IF(rw.STATE ='0', 1, 0))+sum(if(rw.state is null,1,0)) unTask, sum(IF(rw.STATE ='1', 1, 0)) finishTask "+
             "FROM bs_sgc_sz_bxgcrw rw " +
-            "LEFT JOIN bs_sgc_sz_jbxx xx  ON xx.waga_code = rw.waga_code " +
+            "LEFT JOIN att_waga_base xx  ON xx.waga_code = rw.waga_code " +
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
             "</if>" +
             "WHERE xx.expr_date is null  " +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND  FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND   xx.waga_type =  #{dto.wagaType}  " +
             "</if>" +
             "<if test='dto.id != null and dto.id != \"\"'>" +
             "AND rw.id = #{dto.id} " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java
index bda6aaab..2d8ba042 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java
@@ -55,14 +55,13 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
     class SzSuperviseProblemProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.WAGA_NAME AS wagaName,xx.WAGA_CODE as wagaCode,xx.engineering_management_unit as engineeringManagementUnit,wt.level, wt.status");
+                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.WAGA_NAME AS wagaName,xx.WAGA_CODE as wagaCode,xx.adm_dep as engineeringManagementUnit,wt.level, wt.status");
                 FROM("bs_sgc_sz_jdjcgcwt wt");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxm xm on wt.project_id = xm.id");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxmnr nr on wt.project_item_id = nr.id");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE,xx.WAGA_NAME, xx.adcd,gl.engineering_management_unit " +
-                        " FROM bs_sgc_sz_jbxx xx LEFT OUTER JOIN bs_sgc_sz_gcgl gl ON xx.WAGA_CODE = gl.WAGA_CODE " +
-                        " WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.WAGA_CODE = xx.WAGA_CODE");
+                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE,xx.WAGA_NAME, xx.adcd,xx.adm_dep " +
+                        " FROM att_waga_base xx  WHERE xx.EXPR_DATE IS NULL ) xx ON rw.WAGA_CODE = xx.WAGA_CODE");
                 WHERE("1=1");
                 WHERE("rw.state =1");
 
@@ -74,7 +73,7 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
                     }
                     // 管理单位
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("xx.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.adm_dep LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     // 工程对象
                     if (StringUtils.isNotBlank(dto.getWagaName())) {
@@ -108,13 +107,13 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
             "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious "+
             "FROM bs_sgc_sz_jdjcgcwt wt " +
             "LEFT JOIN bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id " +
-            "LEFT JOIN bs_sgc_sz_jbxx xx on xx.WAGA_CODE = rw.WAGA_CODE " +
+            "LEFT JOIN att_waga_base xx on xx.WAGA_CODE = rw.WAGA_CODE " +
             "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
             "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
             "</if>" +
             "WHERE xx.EXPR_DATE IS NULL   " +
             "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
-            "AND FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "AND xx.waga_type =  #{dto.wagaType} " +
             "</if>" +
             "<if test='dto.taskId != null and dto.taskId != \"\"'>" +
             "AND wt.task_id = #{dto.taskId} " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java
index d3a82aa0..4d2ea0ce 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java
@@ -36,12 +36,10 @@ public interface SzSuperviseTaskMapper extends BaseMapper<SzSuperviseTask> {
     class SzSuperviseTaskProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.WAGA_NAME as wagaName,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit," +
+                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.WAGA_NAME as wagaName,xx.adm_dep as engineeringManagementUnit," +
                         "rw.WAGA_CODE as wagaCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.state");
                 FROM("bs_sgc_sz_jdjcrw rw");
-                LEFT_OUTER_JOIN("bs_sgc_sz_jbxx xx ON xx.waga_code = rw.waga_code");
-                LEFT_OUTER_JOIN("bs_sgc_sz_gcgl gl ON rw.waga_code = gl.waga_code");
-                WHERE("gl.EXPR_DATE is null");
+                LEFT_OUTER_JOIN("att_waga_base xx ON xx.waga_code = rw.waga_code");
                 WHERE("xx.EXPR_DATE is null");
                 if(param.get("dto") != null) {
                     SzSuperviseTaskDto dto = (SzSuperviseTaskDto)param.get("dto");
@@ -52,7 +50,7 @@ public interface SzSuperviseTaskMapper extends BaseMapper<SzSuperviseTask> {
                         WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')");
                     }
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.adm_dep like concat('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     if(StringUtils.isNotBlank(dto.getWagaName())){
                         WHERE("xx.waga_name LIKE CONCAT('%',#{dto.wagaName},'%')");
@@ -74,14 +72,12 @@ public interface SzSuperviseTaskMapper extends BaseMapper<SzSuperviseTask> {
     class SzSuperviseTaskDetailProvider {
         public String selectTaskInfo(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime,rw.weather,rw.inspectors,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit,rw.state,rw.content," +
+                SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime,rw.weather,rw.inspectors,xx.adm_dep as engineeringManagementUnit,rw.state,rw.content," +
                         "rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime,rw.PATROL_UID as patrolUid, rw.PATROL_NAME as patrolName," +
-                        "xx.WAGA_NAME as wagaName, xx.WAGA_CODE as wagaCode, xx.WAGA_LOC as wagaLoc, xx.WAGA_TYPE as wagatype, xx.ENG_SCAL as engScal," +
+                        "xx.WAGA_NAME as wagaName, xx.WAGA_CODE as wagaCode, xx.WAGA_LOC as wagaLoc, xx.WAGA_TYPE as wagaType, xx.ENG_SCAL as engScal," +
                         "(SELECT GROUP_CONCAT(user_name) FROM sys_user tr WHERE FIND_IN_SET(tr.id,(SELECT INSPECTORS FROM bs_sgc_sz_jdjcrw WHERE id=rw.id))) AS inspectorsName");
                 FROM("bs_sgc_sz_jdjcrw rw");
-                LEFT_OUTER_JOIN("bs_sgc_sz_jbxx xx ON xx.waga_code = rw.waga_code");
-                LEFT_OUTER_JOIN("bs_sgc_sz_gcgl gl ON gl.waga_code = xx.waga_code");
-                WHERE("gl.EXPR_DATE is null");
+                LEFT_OUTER_JOIN("att_waga_base xx ON xx.waga_code = rw.waga_code");
                 WHERE("xx.EXPR_DATE is null");
                 SzSuperviseTaskDto dto = (SzSuperviseTaskDto)param.get("dto");
                 if(dto != null) {