diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/cz/domain/AttStBaseCz.java b/shuili-system/src/main/java/com/kms/yxgh/base/cz/domain/AttStBaseCz.java
index 8bc15f83..a2d61fcf 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/cz/domain/AttStBaseCz.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/cz/domain/AttStBaseCz.java
@@ -1,5 +1,7 @@
 package com.kms.yxgh.base.cz.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.shuili.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -13,6 +15,7 @@ public class AttStBaseCz {
 
     @Excel(name = "测站编码")
     @ApiModelProperty("测站编码")
+    @TableId(value = "stcd", type = IdType.INPUT)
     private String stcd;
 
     @Excel(name = "测站名称")
@@ -155,17 +158,4 @@ public class AttStBaseCz {
     @ApiModelProperty("测站概况")
     private String stcdOv;
 
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String note;
-
-    @Excel(name = "记录生效时间")
-    @ApiModelProperty("记录生效时间")
-    private String effDate;
-
-    @Excel(name = "记录更新时间")
-    @ApiModelProperty("记录更新时间")
-    private String updateDate;
-
-
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/rel/SkDwsRelResDscdnm.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/rel/SkDwsRelResDscdnm.java
index cac15287..e6a5629a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/rel/SkDwsRelResDscdnm.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/rel/SkDwsRelResDscdnm.java
@@ -10,7 +10,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-@TableName("dws_rel_res_dscdnm")
+@TableName("rel_res_ad")
 @Data
 @ApiModel("水库所属行政区划")
 public class SkDwsRelResDscdnm implements Serializable {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResBaseSk.java b/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResBaseSk.java
index 0b4ae9f1..ae3ca3ba 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResBaseSk.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResBaseSk.java
@@ -141,13 +141,6 @@ public class AttResBaseSk implements IAdcd, Serializable {
     @ApiModelProperty("水库概况")
     private String resOv;
 
-    /**
-     * 记录生效时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("记录生效时间")
-    private Date effDate;
 
 
     @TableField(exist = false)
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResRsppSk.java b/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResRsppSk.java
index 2a74c99d..67dfb43e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResRsppSk.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/sk/domain/AttResRsppSk.java
@@ -188,13 +188,6 @@ public class AttResRsppSk implements Serializable {
     @ApiModelProperty("校核重现期")
     private String chrcin;
 
-    /**
-     * 记录生效时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty("记录生效时间")
-    private Date effDate;
 
     /**
      * 备注
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/sk/mapper/AttResBaseSkMapper.java b/shuili-system/src/main/java/com/kms/yxgh/base/sk/mapper/AttResBaseSkMapper.java
index 9d8399ec..c270cb8a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/sk/mapper/AttResBaseSkMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/sk/mapper/AttResBaseSkMapper.java
@@ -21,7 +21,7 @@ public interface AttResBaseSkMapper extends BaseMapper<AttResBaseSk> {
 
     @Select("<script>" +
             "select base.*,rel.adcd from att_res_base base " +
-            "left join dws_rel_res_dscdnm rel on base.res_code = rel.res_code " +
+            "left join rel_res_ad rel on base.res_code = rel.res_code " +
             "where 1=1 " +
             "<if test='data.resCode != null and data.resCode != \"\"'>" +
             "and base.res_code = #{data.resCode} " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/sz/domain/AttWagaBaseSz.java b/shuili-system/src/main/java/com/kms/yxgh/base/sz/domain/AttWagaBaseSz.java
index cfb57eb6..6a2f0ecc 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/sz/domain/AttWagaBaseSz.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/sz/domain/AttWagaBaseSz.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.kms.yxgh.business.common.dto.IAdcd;
 import lombok.Data;
 
+import java.util.Date;
+
 @TableName("att_waga_base")
 @Data
 public class AttWagaBaseSz implements IAdcd {
@@ -14,9 +16,25 @@ public class AttWagaBaseSz implements IAdcd {
     @TableId(value = "waga_code", type = IdType.INPUT)
     private String wagaCode;
     private String wagaName;
+    private String wagaCenLon;
+    private String wagaCenLat;
+    private String wagaLoc;
+    private String ifCeb;
+    private String ifHyj;
+    private String ifGse;
+    private String ifSge;
     private String wagaType;
-    private String wagaGrad;
+    private String engGrad;
     private String engScal;
+    private String mainBuildGrad;
+    private String freqin;
+    private Date compDate;
+    private Date checkDate;
+    private String mnun;
+    private String admDep;
+    private String wagaOv;
+    private String note;
+    private Date updateDate;
     @TableField(exist = false)
     private String adcd;
-}
+}
\ No newline at end of file
diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/sz/mapper/AttWagaBaseSzMapper.java b/shuili-system/src/main/java/com/kms/yxgh/base/sz/mapper/AttWagaBaseSzMapper.java
index 19bf60e6..888553b4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/base/sz/mapper/AttWagaBaseSzMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/base/sz/mapper/AttWagaBaseSzMapper.java
@@ -6,20 +6,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.base.sz.domain.AttWagaBaseSz;
 import com.kms.yxgh.business.sz.dto.*;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
-import java.util.Date;
-import java.util.List;
-
 @DS("share")
 @Repository
 public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
 
+    @Select("select adcd from rel_waga_ad where waga_code = #{wagaCode} ")
+    String getAdcd(@Param("wagaCode") String wagaCode);
+
     @Select({
             "<script>",
-            "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  ",
+            "select df.*,lf.adcd  ",
             "from att_waga_base df ",
+            "left join rel_waga_ad lf on lf.waga_code = df.waga_code ",
             "where 1=1 ",
             "<if test='dto.wagaName != null and dto.wagaName != \"\"'>",
             "and waga_name like concat('%', #{dto.wagaName}, '%') ",
@@ -28,23 +32,22 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
             "and waga_type = #{dto.wagaType} ",
             "</if>",
             "<if test='dto.adcdQx!= null and dto.adcdQx != \"\"'>",
-            "and adcd like concat(#{dto.adcdQx}, '%') ",
+            "and lf.adcd like concat(#{dto.adcdQx}, '%') ",
             "</if>",
             "</script>"
     })
     @Results({
             @Result(property = "wagaCode", column = "waga_code"),
             @Result(property = "wagaName", column = "waga_name"),
-            @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
-            @Result(property = "lastTime", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.business.sz.mapper.SzRecordMapper.getLastInsertTimeByWagaCodeAndPlanId"))
     })
     IPage<SzProjectListDto> getSzProjectListWithPage(Page<SzProjectListDto> page, @Param("dto") AttWagaBaseSz bsSgcSzGcda);
 
 
     @Select({
             "<script>",
-            "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  ",
+            "select df.*,lf.adcd ",
             "from att_waga_base df ",
+            "left join rel_waga_ad lf on lf.waga_code = df.waga_code ",
             "where 1=1 ",
             "<if test='sp.wagaCode != null  and sp.wagaCode != \"\"'>",
             "and waga_code = #{sp.wagaCode} ",
@@ -52,22 +55,18 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
             "<if test='sp.wagaName != null  and sp.wagaName != \"\"'>",
             "and waga_name like concat('%', #{sp.wagaName}, '%') ",
             "</if>",
-            "<if test='sp.engineeringManagementUnit!= null and sp.engineeringManagementUnit != \"\"'>",
-            "and df.adm_dep  like concat('%', #{sp.engineeringManagementUnit}, '%') ",
-            "</if>",
             "</script>"
     })
     @Results({
             @Result(property = "wagaCode", column = "waga_code"),
             @Result(property = "wagaName", column = "waga_name"),
-            @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"),
-            @Result(property = "lastTime", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.business.sz.mapper.SzYhRecordMapper.getLastInsertTimeByWagaCode"))
     })
     IPage<SzProjectListDto> getSzYhProjectListWithPage(Page<SzProjectListDto> page, @Param("sp") SzYhProjectQueDto sp);
 
     @Select("<script>" +
-            "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  " +
+            "select df.*,lf.adcd " +
             "from att_waga_base df " +
+            "left join rel_waga_ad lf on lf.waga_code = df.waga_code " +
             "WHERE 1=1 " +
             "<if test='szProject.wagaType != null and szProject.wagaType != \"\"'>" +
             "AND df.waga_type = #{szProject.wagaType} " +
@@ -79,19 +78,18 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
             "AND df.waga_name like concat('%', #{szProject.wagaName}, '%') " +
             "</if>" +
             "<if test='szProject.adcd != null and szProject.adcd != \"\"'>" +
-            "AND df.adcd like concat(#{szProject.adcd}, '%') " +
+            "AND lf.adcd like concat(#{szProject.adcd}, '%') " +
             "</if>" +
             "</script>")
     IPage<SzYqProjectListDto> getSzYqProjectListWithPage(Page<SzYqProjectListDto> page, @Param("szProject") SzYqProjectQueDto szProject);
 
     @Select("<script>" +
             "SELECT waga_code , waga_name  " +
-            "FROM  att_waga_base  where expr_date is null " +
+            "FROM  att_waga_base  sz  " +
+            "left join rel_waga_ad lf on lf.waga_code = sz.waga_code " +
+            "WHERE 1=1 " +
             "<if test='szProject.adcd != null and szProject.adcd != \"\"'>" +
-            "AND adcd like concat(#{szProject.adcd}, '%') " +
-            "</if>" +
-            "<if test='szProject.riverLocation != null and szProject.riverLocation != \"\"'>" +
-            "AND river_location = #{szProject.riverLocation} " +
+            "AND lf.adcd like concat(#{szProject.adcd}, '%') " +
             "</if>" +
             "<if test='szProject.wagaCodes != null and szProject.wagaCodes.size() > 0'>" +
             "AND waga_code in " +
@@ -103,8 +101,6 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
     @Results({
             @Result(property = "wagaCode", column = "waga_code"),
             @Result(property = "wagaName", column = "waga_name"),
-            @Result(property = "rainfall", column = "waga_code", javaType = Double.class, one = @One(select = "com.kms.yxgh.business.sz.mapper.SzWaterRegimeMapper.getTodayRainfall")),
-            @Result(property = "waterLevel", column = "waga_code", javaType = Double.class, one = @One(select = "com.kms.yxgh.business.sz.mapper.SzWaterRegimeMapper.getTodayWaterLevel")),
     })
     IPage<SzYqStatisticsProjectListDto> getSzYqProjectStatisticsWithPage(Page<SzYqStatisticsProjectListDto> page, @Param("szProject") SzYqStatisticsProjectQueDto szProject);
 
@@ -112,8 +108,9 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
     @Select({
             "<script>",
             "SELECT ",
-            "df.id waga_id, df.waga_code waga_code, df.waga_name waga_name, df.waga_type waga_type ",
+            " df.waga_code waga_code, df.waga_name waga_name, df.waga_type waga_type ",
             "FROM att_waga_base df ",
+            "left join rel_waga_ad lf on lf.waga_code = df.waga_code ",
             "where 1=1 ",
             "<if test='dto.wagaName != null  and dto.wagaName != \"\"'>",
             "and df.waga_name like concat('%', #{dto.wagaName}, '%') ",
@@ -122,25 +119,12 @@ public interface AttWagaBaseSzMapper extends BaseMapper<AttWagaBaseSz> {
             "and df.waga_type = #{dto.wagaType} ",
             "</if>",
             "<if test='dto.adcd != null and dto.adcd != \"\"'>",
-            "and df.adcd like concat(#{dto.adcd}, '%') ",
-            "</if>",
-            "and EXISTS (SELECT 1 FROM bs_sgc_sz_xslx line WHERE line.waga_code = df.waga_code ",
-            "<if test='dto.lineName != null and dto.lineName != \"\"'>",
-            "and line.name like concat('%', #{dto.lineName}, '%') ",
-            "</if>",
-            "<if test='dto.type != null and dto.type != \"\"'>",
-            "and line.type = #{dto.type} ",
+            "and lf.adcd like concat(#{dto.adcd}, '%') ",
             "</if>",
-            "<if test='dto.dutyHolderType != null and dto.dutyHolderType != \"\"'>",
-            "and line.duty_holder_type = #{dto.dutyHolderType} ",
-            "</if> )",
             "</script>"
     })
     @Results(value = {
             @Result(property = "wagaCode", column = "waga_code"),
-            @Result(property = "dutyHolders", column = "waga_code",
-                    javaType = List.class,
-                    many = @Many(select = "com.kms.yg.sz.mapper.BsSgcSzFzrMapper.getByWagaCode"))
     })
     IPage<SzCheckingLineProjectListDto> getSzCheckingLineProjectListWithPage(Page<SzProjectListDto> page, @Param("dto") SzCheckingLineSearchDto dto);
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/cz/enmu/MarkTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/business/cz/enmu/MarkTypeEnum.java
index dfda4504..e84f74b4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/cz/enmu/MarkTypeEnum.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/cz/enmu/MarkTypeEnum.java
@@ -16,10 +16,10 @@ import java.util.Map;
 @Getter
 public enum MarkTypeEnum implements MonitorIndexInfo {
 
-    FSLTDZ_LIMIT("汛限水位", "m", Constants.DEFAULT_KEY_FIELD, "fsltdz", AttResRfkwlvSkMapper.class),
-    CHFLLV("校准洪核水位", "m", Constants.DEFAULT_KEY_FIELD, "chfllv", AttResRsppSkMapper.class),
-    NORM_WAT_LEV("正常蓄水位", "m", Constants.DEFAULT_KEY_FIELD, "norm_wat_lev ", AttWagaSlhyprSzMapper.class),
-    DSFLLV("设计洪水位", "m", Constants.DEFAULT_KEY_FIELD, "dsfllv", AttWagaSlhyprSzMapper.class);
+    FSLTDZ_LIMIT("汛限水位", "m", "RES_CODE", "fsltdz", AttResRfkwlvSkMapper.class),
+    CHFLLV("校准洪核水位", "m", "RES_CODE", "chfllv", AttResRsppSkMapper.class),
+    NORM_WAT_LEV("正常蓄水位", "m","waga_code", "norm_wat_lev ", AttWagaSlhyprSzMapper.class),
+    DSFLLV("设计洪水位", "m", "waga_code", "dsfllv", AttWagaSlhyprSzMapper.class);
 
     private final String zhName;
     private final String unit;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/AlarmInfoMapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/AlarmInfoMapper.java
index e0c34bcc..bde3510d 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/AlarmInfoMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/AlarmInfoMapper.java
@@ -1,6 +1,5 @@
 package com.kms.yxgh.business.cz.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.business.cz.domain.AlarmInfo;
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Repository;
  * @author kms
  * @date 2024-04-24
  */
-@DS("share")
 @Repository
 public interface AlarmInfoMapper extends BaseMapper<AlarmInfo> {
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/BsSgcStMonMapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/BsSgcStMonMapper.java
index 8050dabc..afb94805 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/BsSgcStMonMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/BsSgcStMonMapper.java
@@ -1,6 +1,5 @@
 package com.kms.yxgh.business.cz.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.business.cz.domain.BsSgcStMon;
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Repository;
  * @author kms
  * @date 2024-04-24
  */
-@DS("share")
 @Repository
 public interface BsSgcStMonMapper extends BaseMapper<BsSgcStMon> {
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/MonitorConfigMapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/MonitorConfigMapper.java
index e867bea7..ce8f76a6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/MonitorConfigMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/cz/mapper/MonitorConfigMapper.java
@@ -1,6 +1,5 @@
 package com.kms.yxgh.business.cz.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kms.yxgh.business.cz.domain.MonitorConfig;
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Repository;
  * @author kms
  * @date 2024-04-24
  */
-@DS("share")
 @Repository
 public interface MonitorConfigMapper extends BaseMapper<MonitorConfig> {
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingProblemV2.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingProblemV2.java
index e7e0e94b..228d367e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingProblemV2.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingProblemV2.java
@@ -137,7 +137,7 @@ public class SzCheckingProblemV2 extends SyBaseEntity {
      * 附加配置
      */
     @ApiModelProperty("备注")
-    private String remark;
+    private String note;
 
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingRecord.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingRecord.java
index 37b4a52d..70d73afa 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingRecord.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingRecord.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Date;
 @TableName("bs_sgc_sz_xsxcjl")
 @Data
 @ApiModel("水闸项目管理记录")
-public class SzCheckingRecord extends SyBaseEntity {
+public class SzCheckingRecord extends SyBaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -109,7 +110,7 @@ public class SzCheckingRecord extends SyBaseEntity {
      * 附加配置
      */
     @ApiModelProperty("备注")
-    private String remark;
+    private String note;
 
     /**
      * 创建人名称
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingV2ProjectManage.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingV2ProjectManage.java
index c87361f8..ce7721c8 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingV2ProjectManage.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzCheckingV2ProjectManage.java
@@ -56,7 +56,7 @@ public class SzCheckingV2ProjectManage extends SyBaseEntity {
      * 附加配置
      */
     @ApiModelProperty("备注")
-    private String remark;
+    private String note;
 
     /**
      * 创建人名称
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzYhV2.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzYhV2.java
index a4944990..745c34e7 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzYhV2.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/domain/SzYhV2.java
@@ -127,7 +127,7 @@ public class SzYhV2 extends SyBaseEntity {
      * 附加配置
      */
     @ApiModelProperty("备注")
-    private String remark;
+    private String note;
 
 
     private String content;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingProblemV2Mapper.java
index 294e5fa8..e74d7a47 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingProblemV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingProblemV2Mapper.java
@@ -22,16 +22,15 @@ import java.util.List;
 public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV2> {
 
     @Select("<script> " +
-            "select base.adcd code ,count(1) sum  " +
+            "select xm.note code ,count(1) sum  " +
             "from bs_sgc_sz_xcqx xm " +
-            "left join att_dike_base base on base.dike_code=xm.waga_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.adcdQx != null and data.adcdQx != \"\"'>" +
-            "and base.adcd like concat(#{data.adcdQx}, '%') " +
+            "and xm.note like concat(#{data.adcdQx}, '%') " +
             "</if>" +
-            "group by base.adcd " +
+            "group by xm.note " +
             "</script>")
     List<CountDto> count(@Param("data") ObjectStatisticQueDto sp);
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingRecordV2Mapper.java
index 62b48932..ad67e290 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingRecordV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingRecordV2Mapper.java
@@ -22,19 +22,18 @@ import java.util.List;
 public interface SzCheckingRecordV2Mapper extends BaseMapper<SzCheckingRecord> {
 
     @Select("<script> " +
-            "select base.adcd code ,count(1) sum  " +
+            "select xm.note code ,count(1) sum  " +
             "from bs_sgc_sz_xsxcjl xm " +
-            "left join att_dike_base base on base.dike_code=xm.waga_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.adcdQx != null and data.adcdQx != \"\"'>" +
-            "and base.adcd like concat(#{data.adcdQx}, '%') " +
+            "and xm.note like concat(#{data.adcdQx}, '%') " +
             "</if>" +
             "<if test='category != null'>" +
             "and xm.category = #{category.value} " +
             "</if>" +
-            "group by base.adcd " +
+            "group by xm.note " +
             "</script>")
     List<CountDto> count(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category);
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingV2Mapper.java
index bf237a21..fb102018 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzCheckingV2Mapper.java
@@ -20,14 +20,13 @@ import java.util.List;
 public interface SzCheckingV2Mapper extends BaseMapper<SzCheckingV2ProjectManage> {
 
     @Select("<script> " +
-            "select base.adcd code ,count(1) sum  " +
+            "select xm.note code ,count(1) sum  " +
             "from bs_sgc_sz_xmgl xm " +
-            "left join att_dike_base base on base.dike_code=xm.waga_code " +
             "where 1=1 " +
             "<if test='data.adcdQx != null and data.adcdQx != \"\"'>" +
-            "and base.adcd like concat(#{data.adcdQx}, '%') " +
+            "and xm.note like concat(#{data.adcdQx}, '%') " +
             "</if>" +
-            "group by base.adcd " +
+            "group by xm.note " +
             "</script>"
     )
     List<CountDto> count(@Param("data") ObjectStatisticQueDto sp);
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzYhV2Mapper.java
index 4c812ae0..d82d62c1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzYhV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/mapper/SzYhV2Mapper.java
@@ -26,16 +26,15 @@ public interface SzYhV2Mapper extends BaseMapper<SzYhV2> {
 
 
     @Select("<script> " +
-            "select base.adcd code ,count(1) sum  " +
+            "select xm.note code ,count(1) sum  " +
             "from bs_sgc_sz_xcyj xm " +
-            "left join att_dike_base base on base.dike_code=xm.waga_code " +
             "where 1=1 " +
             "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
             "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
             "<if test='data.adcdQx != null and data.adcdQx != \"\"'>" +
-            "and base.adcd like concat(#{data.adcdQx}, '%') " +
+            "and xm.note like concat(#{data.adcdQx}, '%') " +
             "</if>" +
-            "group by base.adcd " +
+            "group by xm.note " +
             "</script>")
     List<CountDto> count(@Param("data") ObjectStatisticQueDto sp);
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingRecordV2Service.java
index 845248b5..86f1321e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingRecordV2Service.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yxgh.base.sz.mapper.AttWagaBaseSzMapper;
 import com.kms.yxgh.business.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.business.common.service.SyServiceImpl;
 import com.kms.yxgh.business.df.service.DfCheckingV2Service;
@@ -18,7 +19,8 @@ import com.kms.yxgh.business.sz.dto.v2.SzRecordSearchV2Dto;
 import com.kms.yxgh.business.sz.mapper.SzCheckingRecordV2Mapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.utils.BeanUtils;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,15 +37,23 @@ import java.util.stream.Collectors;
  * @date 2023-11-09
  */
 @Service
-@AllArgsConstructor
 public class SzCheckingRecordV2Service extends SyServiceImpl<SzCheckingRecordV2Mapper, SzCheckingRecord> {
 
-    private final SzYhV2Service szYhV2Service;
+    @Autowired
+    private SzYhV2Service szYhV2Service;
 
+    @Autowired
+    private SzCheckingV2ProjectItemV2Service szCheckingV2ProjectItemV2Service;
 
-    private final SzCheckingV2ProjectItemV2Service szCheckingV2ProjectItemV2Service;
+    @Autowired
+    private SzCheckingProblemV2Service szCheckingProblemV2Service;
 
-    private final SzCheckingProblemV2Service szCheckingProblemV2Service;
+    @Autowired
+    private AttWagaBaseSzMapper attWagaBaseSzMapper;
+
+    @Autowired(required = false)
+    @Lazy
+    private SzCheckingRecordV2Service self;
 
     public IPage<SzRecordDetailV2Dto> list(SearchParam<SzRecordSearchV2Dto> sp) {
         // 分页参数
@@ -148,13 +158,19 @@ public class SzCheckingRecordV2Service extends SyServiceImpl<SzCheckingRecordV2M
         return dto;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public SzRecordDetailV2Dto edit(SzRecordDetailV2Dto szRecord, Boolean commit) {
+        String adcd = attWagaBaseSzMapper.getAdcd(szRecord.getWagaCode());
+        return self.innerEdit(szRecord, commit, adcd);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public SzRecordDetailV2Dto innerEdit(SzRecordDetailV2Dto szRecord, Boolean commit, String adcd) {
         // 先删后加
         myRemovePraIds(szRecord);
         if (commit) {
             SzCheckingRecord szCheckingRecord = new SzCheckingRecord();
             BeanUtils.copyProperties(szRecord, szCheckingRecord);
+            szCheckingRecord.setNote(adcd);
             // 提交为已巡检
             szCheckingRecord.setStatus(DfYhV2StatusEnum.INSPECTED.getValue());
             // 如果相关缺陷大于一条就是养护中
@@ -167,17 +183,18 @@ public class SzCheckingRecordV2Service extends SyServiceImpl<SzCheckingRecordV2M
             mySaveOrUpdate(szCheckingRecord);
             szRecord.setStatus(szCheckingRecord.getStatus());
             szRecord.setRecordId(szCheckingRecord.getId());
-            szCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(szRecord));
+            szCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(szRecord, adcd));
             return szRecord;
         } else {
             SzCheckingRecord szCheckingRecord = new SzCheckingRecord();
             BeanUtils.copyProperties(szRecord, szCheckingRecord);
             // 未提交维巡查中
+            szCheckingRecord.setNote(adcd);
             szCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
             mySaveOrUpdate(szCheckingRecord);
             szRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
             szRecord.setRecordId(szCheckingRecord.getId());
-            szCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(szRecord));
+            szCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(szRecord, adcd));
             return szRecord;
         }
     }
@@ -201,7 +218,7 @@ public class SzCheckingRecordV2Service extends SyServiceImpl<SzCheckingRecordV2M
         }
     }
 
-    public static List<SzCheckingProblemV2> convertToImages(SzRecordDetailV2Dto dfRecord) {
+    public static List<SzCheckingProblemV2> convertToImages(SzRecordDetailV2Dto dfRecord, String adcd) {
         List<SzCheckingProblemV2> szCheckingProblemV2s = new ArrayList<>();
         dfRecord.getProblems().forEach(e -> {
             SzCheckingProblemV2 szCheckingProblemV2 = new SzCheckingProblemV2();
@@ -219,6 +236,7 @@ public class SzCheckingRecordV2Service extends SyServiceImpl<SzCheckingRecordV2M
             szCheckingProblemV2.setCategory(dfRecord.getCategory());
             szCheckingProblemV2.setStatus(dfRecord.getStatus());
             szCheckingProblemV2.setItemId(e.getItemId());
+            szCheckingProblemV2.setNote(adcd);
             if (null != e.getParts()) {
                 szCheckingProblemV2.setParts(String.join(",", e.getParts()));
             }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingV2Service.java
index 3ce416a7..8d88eddc 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzCheckingV2Service.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yxgh.base.sz.mapper.AttWagaBaseSzMapper;
 import com.kms.yxgh.business.common.service.SyServiceImpl;
 import com.kms.yxgh.business.df.service.DfCheckingV2Service;
 import com.kms.yxgh.business.sz.domain.SzCheckingV2ProjectItem;
@@ -16,7 +17,8 @@ import com.kms.yxgh.business.sz.dto.v2.SzV2CheckingSearchDto;
 import com.kms.yxgh.business.sz.mapper.SzCheckingV2Mapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.utils.BeanUtils;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,10 +35,16 @@ import java.util.stream.Collectors;
  * @date 2023-11-09
  */
 @Service
-@AllArgsConstructor
 public class SzCheckingV2Service extends SyServiceImpl<SzCheckingV2Mapper, SzCheckingV2ProjectManage> {
 
-    private final SzCheckingV2ProjectItemV2Service szCheckingV2ProjectItemV2Service;
+    @Autowired
+    private SzCheckingV2ProjectItemV2Service szCheckingV2ProjectItemV2Service;
+
+    @Autowired
+    private AttWagaBaseSzMapper attWagaBaseSzMapper;
+    @Autowired(required = false)
+    @Lazy
+    private SzCheckingV2Service self;
 
     public IPage<SzV2CheckingDto> list(SearchParam<SzV2CheckingSearchDto> sp) {
         // 分页参数
@@ -142,11 +150,17 @@ public class SzCheckingV2Service extends SyServiceImpl<SzCheckingV2Mapper, SzChe
         return dto;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     public SzV2CheckingDto add(SzV2CheckingDto dto) {
+        String adcd = attWagaBaseSzMapper.getAdcd(dto.getWagaCode());
+        return self.innerAdd(dto, adcd);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public SzV2CheckingDto innerAdd(SzV2CheckingDto dto, String adcd) {
         // 将 DTO 转换为实体对象
         SzCheckingV2ProjectManage szCheckingV2ProjectManage = new SzCheckingV2ProjectManage();
         BeanUtils.copyProperties(dto, szCheckingV2ProjectManage);
+        szCheckingV2ProjectManage.setNote(adcd);
 
         // 保存实体对象
         if (!save(szCheckingV2ProjectManage)) {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzYhV2Service.java
index f060feae..2e05b493 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/business/sz/service/SzYhV2Service.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yxgh.base.sz.mapper.AttWagaBaseSzMapper;
 import com.kms.yxgh.business.common.ApprovalStatusEnum;
 import com.kms.yxgh.business.common.ApprovalTypeEnum;
 import com.kms.yxgh.business.common.dto.ApprovalDetailDto;
@@ -29,8 +30,10 @@ import com.kms.yxgh.business.sz.mapper.SzCheckingRecordV2Mapper;
 import com.kms.yxgh.business.sz.mapper.SzYhV2Mapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.utils.BeanUtils;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
@@ -44,17 +47,26 @@ import java.util.stream.Collectors;
  * @date 2023-11-09
  */
 @Service
-@AllArgsConstructor
 public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper, SzYhV2, SzRecordSearchV2Dto, SzYhApproveDto> {
 
+    @Autowired
     private ApprovalService approvalService;
 
+    @Autowired
     private SzCheckingRecordV2Mapper szCheckingRecordV2Mapper;
 
+    @Autowired
     private SzCheckingProblemV2Service szCheckingProblemV2Service;
 
+    @Autowired
     private SzCheckingProblemV2Mapper szCheckingProblemV2Mapper;
 
+    @Autowired
+    private AttWagaBaseSzMapper attWagaBaseSzMapper;
+
+    @Autowired(required = false)
+    @Lazy
+    private SzYhV2Service self;
 
     public IPage<SzYhListV2Dto> list(SearchParam<SzRecordSearchV2Dto> sp) {
         // 分页参数
@@ -146,10 +158,17 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
     }
 
     public SzYhDetailV2Dto edit(SzYhDetailV2Dto szYh, Boolean commit) {
+        String adcd = attWagaBaseSzMapper.getAdcd(szYh.getWagaCode());
+        return self.innerEdit(szYh, commit, adcd);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public SzYhDetailV2Dto innerEdit(SzYhDetailV2Dto szYh, Boolean commit, String adcd) {
         SzYhDetailV2Dto dto = new SzYhDetailV2Dto();
         SzYhV2 szYhV2 = new SzYhV2();
         if (commit) {
             BeanUtils.copyProperties(szYh, szYhV2);
+            szYhV2.setNote(adcd);
             szYhV2.setDoc(getDocStrJson(szYh.getDoc()));
             szYhV2.setStatus(DfYhV2StatusEnum.YES_UNDER.getValue());
             saveOrUpdate(szYhV2);
@@ -159,6 +178,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
         } else {
             BeanUtils.copyProperties(szYh, szYhV2);
             szYhV2.setDoc(getDocStrJson(szYh.getDoc()));
+            szYhV2.setNote(adcd);
             szYhV2.setStatus(DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue());
             saveOrUpdate(szYhV2);
             BeanUtils.copyProperties(szYhV2, dto);