diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
index 0f2988a8..2e59dacc 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
@@ -1,10 +1,7 @@
 package com.kms.yg.df.controller;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -182,6 +179,15 @@ public class BsSgcDfSafeJbxxController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody BsSgcDfSafeJbxx bsSgcSzSafeJbxx) {
 //        bsSgcSzSafeJbxx.setStatus("4");
+        if (bsSgcSzSafeJbxx.getStatus().equals("6")) {
+            String id = bsSgcSzSafeJbxx.getId();
+            BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id);
+            byId.setExprDate(new Date());
+            byId.setId(UUID.randomUUID().toString());
+            bsSgcSzSafeJbxxService.save(byId);
+            bsSgcSzSafeJbxx.setEffDate(new Date());
+            bsSgcSzSafeJbxx.setExprDate(null);
+        }
         return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));
     }
 
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java
index d0a1b760..31529cc9 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-29
  */
-@TableName("bs_sgc_df_dfhdm")
+@TableName("att_dike_bnbdcrpr")
 @Data
 @ApiModel("堤防横断面")
 public class BsSgcDfDfhdm extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
index c09e74ac..be58f857 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_df_gcxy")
+@TableName("att_dike_dbiabt")
 @Data
 @ApiModel("工程效益")
 public class BsSgcDfGcxy extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
index 4df57d07..dfc8c379 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_df_hdmtzz")
+@TableName("att_dike_dktr")
 @Data
 @ApiModel("横断面特征值")
 public class BsSgcDfHdmtzz extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java
index 365d2f06..c5ea17cd 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-29
  */
-@TableName("bs_sgc_df_jyjl")
+@TableName("att_dike_dkhos")
 @Data
 @ApiModel("决溢记录")
 public class BsSgcDfJyjl extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
index dcfabc0f..a1704424 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_df_safe_jbxx")
+@TableName("att_dike_base")
 @Data
 @ApiModel("堤防安全管理基本信息")
 public class BsSgcDfSafeJbxx extends BaseEntity
@@ -76,7 +76,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity
     /** 堤防级别 */
     @Excel(name = "堤防级别")
     @ApiModelProperty("堤防级别")
-    private String engGrad;
+    private String dikeGrad;
 
     /** 主要建筑物级别 */
     @Excel(name = "主要建筑物级别")
diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
index d0a715b1..a1ea0034 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_df_swtz")
+@TableName("att_dike_bsfst")
 @Data
 @ApiModel("水文特征")
 public class BsSgcDfSwtz extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java
index 09dca330..16fa67f3 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_sz_cxjl")
+@TableName("att_waga_sldnnt")
 @Data
 @ApiModel("出险记录")
 public class BsSgcSzCxjl extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java
index cc343a95..7a8564d2 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_sz_gcjg")
+@TableName("att_waga_sligvl")
 @Data
 @ApiModel("工程结构")
 public class BsSgcSzGcjg extends BaseEntity {
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java
index 281fd913..2e79de22 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_sz_gctx")
+@TableName("att_waga_slprch")
 @Data
 @ApiModel("工程特性")
 public class BsSgcSzGctx extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
index 23b8dadb..e25f1d16 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_sz_safe_jbxx")
+@TableName("att_waga_base")
 @Data
 @ApiModel("水闸安全管理基本信息")
 public class BsSgcSzSafeJbxx extends BaseEntity {
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java
index ef4020ee..de400f15 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java
@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-01-17
  */
-@TableName("bs_sgc_sz_swtz")
+@TableName("att_waga_slhypr")
 @Data
 @ApiModel("水文特征")
 public class BsSgcSzSwtz extends BaseEntity
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java
index e6308f02..dd3d2132 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @author kms
  * @date 2024-02-28
  */
-@TableName("bs_sgc_sz_xlnl")
+@TableName("att_waga_escpp")
 @Data
 @ApiModel("泄流能力")
 public class BsSgcSzXlnl extends BaseEntity {
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
index f3b54cfa..dac7ff09 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml
@@ -8,7 +8,7 @@
         SELECT sx.`NAME`,
                COUNT(1) num
         FROM bs_sgc_df_dfrw ss
-                 LEFT JOIN bs_sgc_df_safe_jbxx sj ON sj.dike_code = ss.dike_code
+                 LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code
                  LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml
index e435c813..22d18a83 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_df_bzhjs sf
-                 left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code
+                 left join att_dike_base sj on sf.dike_code = sj.dike_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml
index 99e56c33..72bfcd79 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_df_dagl sd
-                 left join bs_sgc_df_safe_jbxx sj on sd.dike_code = sj.dike_code
+                 left join att_dike_base sj on sd.dike_code = sj.dike_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
index ad3e62c2..78e912f4 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml
@@ -8,7 +8,7 @@
         select sj.dike_name,
                 sf.*
         from bs_sgc_df_fzr sf
-                 left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code
+                 left join att_dike_base sj on sf.dike_code = sj.dike_code
     </sql>
 
 
@@ -17,7 +17,7 @@
                count(1) num,
                sf.type
         from bs_sgc_df_fzr sf
-                 left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code
+                 left join att_dike_base sj on sf.dike_code = sj.dike_code
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml
index e8ae0f5d..57b4aecd 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_df_jfgl sf
-                 left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code
+                 left join att_dike_base sj on sf.dike_code = sj.dike_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml
index 6acc58cd..b2c1e14d 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml
@@ -11,7 +11,7 @@
                sj.adcd,
                sq.*
         from bs_sgc_df_qqhj sq
-                 left join bs_sgc_df_safe_jbxx sj on sq.dike_code = sj.dike_code
+                 left join att_dike_base sj on sq.dike_code = sj.dike_code
     </sql>
 
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
index 8e372d02..ce50acdc 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml
@@ -8,7 +8,7 @@
         select sx.name,
                count(1) num,
                sj.`status`
-        from bs_sgc_df_safe_jbxx sj
+        from att_dike_base sj
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
index cfaf8c5b..9011d077 100644
--- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml
@@ -9,7 +9,7 @@
                count(1) num,
                sx.`name`
         from bs_sgc_df_yhxx sy
-            left join bs_sgc_df_safe_jbxx sj on sj.dike_code=sy.dike_code
+            left join att_dike_base sj on sj.dike_code=sy.dike_code
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
index 473fce10..26b6fb5c 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml
@@ -8,7 +8,7 @@
         SELECT sx.`NAME`,
                COUNT(1) num
         FROM bs_sgc_sz_szrw ss
-                 LEFT JOIN bs_sgc_sz_safe_jbxx sj ON sj.waga_code = ss.waga_code
+                 LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code
                  LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml
index 05d639f7..1056caa5 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_sz_bzhjs sf
-                 left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code
+                 left join att_waga_base sj on sf.waga_code = sj.waga_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml
index 85b9da98..1cbf29de 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_sz_dagl sd
-                 left join bs_sgc_sz_safe_jbxx sj on sd.waga_code = sj.waga_code
+                 left join att_waga_base sj on sd.waga_code = sj.waga_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
index 18873cd9..55649300 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml
@@ -8,7 +8,7 @@
         select sj.waga_name,
                 sf.*
         from bs_sgc_sz_fzr sf
-                 left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code
+                 left join att_waga_base sj on sf.waga_code = sj.waga_code
     </sql>
 
 
@@ -17,7 +17,7 @@
                count(1) num,
                sf.type
         from bs_sgc_sz_fzr sf
-                 left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code
+                 left join att_waga_base sj on sf.waga_code = sj.waga_code
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml
index 0b70d0f7..6aef7db6 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml
@@ -7,7 +7,7 @@
     <sql id="info">
         select *
         from bs_sgc_sz_jfgl sf
-                 left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code
+                 left join att_waga_base sj on sf.waga_code = sj.waga_code
 
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
index 517ca51f..712780cb 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
@@ -12,7 +12,7 @@
                sj.adcd,
                sq.*
         from bs_sgc_sz_qqhj sq
-                 left join bs_sgc_sz_safe_jbxx sj on sq.waga_code = sj.waga_code
+                 left join att_waga_base sj on sq.waga_code = sj.waga_code
     </sql>
 
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
index 190532a9..cc3ac87a 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml
@@ -8,7 +8,7 @@
         select sx.name,
                count(1) num,
                sj.`status`
-        from bs_sgc_sz_safe_jbxx sj
+        from att_waga_base sj
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
index e211aed3..b7cff06f 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml
@@ -9,7 +9,7 @@
                count(1) num,
                sx.`name`
         from bs_sgc_sz_yhxx sy
-            left join bs_sgc_sz_safe_jbxx sj on sj.waga_code=sy.waga_code
+            left join att_waga_base sj on sj.waga_code=sy.waga_code
                  left join sys_xzqh sx on sj.adcd=sx.xzqhdm
     </sql>
 
diff --git a/sql/zj/v4.0.0/增量更新v2/v3.sql b/sql/zj/v4.0.0/增量更新v2/v3.sql
index d9998522..d024f2d4 100644
--- a/sql/zj/v4.0.0/增量更新v2/v3.sql
+++ b/sql/zj/v4.0.0/增量更新v2/v3.sql
@@ -1,4 +1,4 @@
-1.
+
 ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzbp`
     CHANGE COLUMN `sluice_code` `waga_code` varchar (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水闸编码' AFTER `mark_name`,
     CHANGE COLUMN `sluice_name` `waga_name` varchar (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水闸名称' AFTER `adcd`;