From 078988866e1e7c1499455ba4a5d6f4dad00de9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”>
Date: Tue, 25 Mar 2025 15:39:25 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysXzqhController.java  | 11 +--
 .../java/com/kms/common/utils/UserUtils.java  | 18 ++--
 .../kms/system/service/SysXzqhService.java    | 12 ---
 .../yg/df/service/BsSgcDfSpPlayService.java   |  1 -
 .../yxgh/common/dto/ApprovalDetailDto.java    | 14 ++-
 .../yxgh/common/dto/ApprovalSearchDto.java    |  4 +-
 .../kms/yxgh/common/dto/IAdcdDeptRole.java    | 32 +++++++
 .../yxgh/common/enums/StaticIndexEnum.java    |  2 -
 .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java   | 11 ++-
 .../yxgh/df/dto/v2/DfV2CheckingSearchDto.java | 18 +++-
 .../df/mapper/DfCheckingProblemV2Mapper.java  |  9 ++
 .../df/mapper/DfCheckingRecordV2Mapper.java   |  6 ++
 .../yxgh/df/mapper/DfCheckingV2Mapper.java    |  7 ++
 .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java  |  2 +
 .../df/service/AuthorityDikeCodeService.java  | 28 +++---
 .../service/DfCheckingProblemV2Service.java   | 48 +----------
 .../df/service/DfCheckingRecordV2Service.java | 44 +---------
 .../yxgh/df/service/DfCheckingV2Service.java  | 34 +-------
 .../kms/yxgh/df/service/DfYhV2Service.java    | 56 +-----------
 .../kms/yxgh/dw/dto/DwRecordSearchV2Dto.java  | 12 ++-
 .../yxgh/dw/dto/DwV2CheckingSearchDto.java    | 16 +++-
 .../dw/mapper/DwCheckingProblemV2Mapper.java  |  7 ++
 .../dw/mapper/DwCheckingRecordV2Mapper.java   |  5 ++
 .../yxgh/dw/mapper/DwCheckingV2Mapper.java    |  7 +-
 .../com/kms/yxgh/dw/mapper/DwYhV2Mapper.java  |  4 +-
 .../service/DwCheckingProblemV2Service.java   | 55 +-----------
 .../dw/service/DwCheckingRecordV2Service.java | 45 +---------
 .../yxgh/dw/service/DwCheckingV2Service.java  | 30 +------
 .../kms/yxgh/dw/service/DwYhV2Service.java    | 56 +-----------
 .../yxgh/sz/dto/v2/SzRecordSearchV2Dto.java   |  8 +-
 .../yxgh/sz/dto/v2/SzV2CheckingSearchDto.java | 17 +++-
 .../sz/mapper/SzCheckingProblemV2Mapper.java  |  9 ++
 .../sz/mapper/SzCheckingRecordV2Mapper.java   |  7 ++
 .../yxgh/sz/mapper/SzCheckingV2Mapper.java    |  7 ++
 .../com/kms/yxgh/sz/mapper/SzYhV2Mapper.java  |  3 +
 .../service/SzCheckingProblemV2Service.java   | 44 +---------
 .../sz/service/SzCheckingRecordV2Service.java | 46 +---------
 .../yxgh/sz/service/SzCheckingV2Service.java  | 26 +-----
 .../kms/yxgh/sz/service/SzYhV2Service.java    | 54 +-----------
 .../mapper/yxgh/DfCheckingV2Mapper.xml        | 49 +++++++++++
 .../mapper/yxgh/DfProblemV2Mapper.xml         | 85 +++++++++++++++++++
 .../mapper/yxgh/DfRecordV2Mapper.xml          | 68 +++++++++++++++
 .../resources/mapper/yxgh/DfYhV2Mapper.xml    | 70 ++++++++++++++-
 .../mapper/yxgh/DwCheckingV2Mapper.xml        | 49 +++++++++++
 .../mapper/yxgh/DwProblemV2Mapper.xml         | 85 +++++++++++++++++++
 .../mapper/yxgh/DwRecordV2Mapper.xml          | 68 +++++++++++++++
 .../resources/mapper/yxgh/DwYhV2Mapper.xml    | 69 +++++++++++++++
 .../mapper/yxgh/SzCheckingV2Mapper.xml        | 49 +++++++++++
 .../mapper/yxgh/SzProblemV2Mapper.xml         | 85 +++++++++++++++++++
 .../mapper/yxgh/SzYhRecordV2Mapper.xml        | 68 +++++++++++++++
 .../resources/mapper/yxgh/SzYhV2Mapper.xml    | 67 +++++++++++++++
 51 files changed, 1037 insertions(+), 590 deletions(-)
 create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcdDeptRole.java
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DfCheckingV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DfProblemV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DfRecordV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DwProblemV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DwRecordV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/SzProblemV2Mapper.xml
 create mode 100644 shuili-system/src/main/resources/mapper/yxgh/SzYhRecordV2Mapper.xml

diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
index 5acfc9b5..b5515f17 100644
--- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
+++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
@@ -97,19 +97,16 @@ public class SysXzqhController extends BaseController {
 //        } else {
 //            return AjaxResult.success(xzqh);
 //        }
-//    }RoleJudgeDto roleDeptDistrictCode = SysXzqhService.getRoleDeptDistrictCode();
+//    }
 
     @GetMapping("/common")
     @ApiOperation("通用行政区划")
     public AjaxResult common(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) {
         if (StringUtils.isEmpty(xzqhdm)) {
-            SysDept sysDept = sysDeptService.getById(Objects.requireNonNull(UserUtils.getUser()).getDeptId());
-            RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode();
+            SysUser user = UserUtils.getUser();
+            String deptId = user.getDeptId();
+            SysDept sysDept = sysDeptService.getById(deptId);
             String xzqhId = sysDept.getXzqhId();
-            // 权限切入
-            if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) {
-                xzqhId=roleDeptDistrictCode.getXzqhId();
-            }
             SysXzqh xzqh = sysXzqhService.getById(xzqhId);
             QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
             queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
diff --git a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java
index 277fa591..b54a96fe 100644
--- a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java
+++ b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java
@@ -3,25 +3,20 @@ package com.kms.common.utils;
 import cn.dev33.satoken.stp.StpUtil;
 import com.kms.framework.web.service.SysPermissionService;
 import com.kms.system.domain.SysXzqh;
-import com.kms.system.mapper.SysDeptMapper;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysUserService;
 import com.kms.system.service.SysXzqhService;
-import com.kms.yg.df.domain.dto.RoleJudgeDto;
 import com.kms.yxgh.df.service.AuthorityDikeCodeService;
-import com.kms.yxgh.df.service.DfCheckingProblemV2Service;
 import com.shuili.common.core.domain.entity.SysDept;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.utils.SpringUtils;
 import com.shuili.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Set;
 
 public class UserUtils {
 
 
-
     private static SysUserService userService = null;
 
     private static SysPermissionService sysPermissionService = null;
@@ -73,13 +68,18 @@ public class UserUtils {
                 cicd = xzqh.getXzqhdm();
             }
         }
-        RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode();
-        if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) {
-            cicd = roleDeptDistrictCode.getXzqhId();
-        }
         return cicd;
     }
 
+    public static String getAdcdDeptRole() {
+        SysUser user = getUser();
+        if (user == null) {
+            return "";
+        }
+        return AuthorityDikeCodeService.getAuthorityXzqhCode();
+    }
+
+
     public static SysUser getUser() {
 
         try {
diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
index 412f53e9..c6c80367 100644
--- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
+++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
@@ -1,27 +1,15 @@
 package com.kms.system.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kms.common.utils.UserUtils;
-import com.kms.system.domain.SysRoleDept;
-import com.kms.system.domain.SysUserRole;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.mapper.*;
-import com.kms.yg.df.domain.BsSgcDfManateam;
-import com.kms.yg.df.domain.dto.RoleJudgeDto;
-import com.kms.yg.df.service.BsSgcDfManateamService;
 import com.shuili.common.core.domain.entity.SysDept;
-import com.shuili.common.core.domain.entity.SysRole;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
index 4a30eb6a..46d9c019 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
@@ -52,7 +52,6 @@ public class BsSgcDfSpPlayService {
     static final String SP_PLAY_URL = "/vsap-opp-service/resourceSharing/startTransform";
 
     public ReservoirListDto reservoirList(ReservoirListDto dto) {
-        ReservoirListDto listDto = new ReservoirListDto();
         // 1. 获取水库信息
         String uri = paths.get(BELONG_URL);
         if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(dataSyncUrl)) {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalDetailDto.java
index 8849b41e..c8f1a62c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalDetailDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalDetailDto.java
@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-import java.util.List;
 
 @ApiModel("审批详情")
 @Data
@@ -16,6 +15,19 @@ import java.util.List;
 @NoArgsConstructor
 public class ApprovalDetailDto<T> {
 
+    /**
+     * id
+     */
+    @ApiModelProperty("水闸代码")
+    private String wagaCode;
+
+
+    /**
+     * id
+     */
+    @ApiModelProperty("水闸名称")
+    private String wagaName;
+
     /**
      * id
      */
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
index 1a02b4ed..97368c59 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
@@ -28,7 +28,7 @@ public class ApprovalSearchDto<T> {
 
     public String getDikeCode() {
         if (StringUtils.isEmpty(this.dikeCode)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.dikeCode =AuthorityDikeCodeService.getAuthorityDikeCode();
         }
         return this.dikeCode;
     }
@@ -38,7 +38,7 @@ public class ApprovalSearchDto<T> {
 
     public String getWagaCode() {
         if (StringUtils.isEmpty(this.wagaCode)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode();
         }
         return this.wagaCode;
     }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcdDeptRole.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcdDeptRole.java
new file mode 100644
index 00000000..5f5a68c7
--- /dev/null
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IAdcdDeptRole.java
@@ -0,0 +1,32 @@
+package com.kms.yxgh.common.dto;
+
+import com.kms.common.utils.UserUtils;
+
+public interface IAdcdDeptRole {
+
+    String getAdcd();
+
+    default String getAdcdQx() {
+        String userAdcd = UserUtils.getAdcdDeptRole();
+        String adcd = getAdcd();
+        if (adcd == null) {
+            adcd = userAdcd;
+        }
+        if (adcd == null) {
+            return null;
+        }
+        int index = adcd.length() - 1;
+        while (index >= 0 && adcd.charAt(index) == '0') {
+            index--;
+        }
+        if (index < 0) {
+            return adcd;
+        }
+        if (index > 5) {
+            return adcd.replaceAll("000(000)?$", "");
+        } else {
+            return adcd.substring(0, 6).replaceAll("00(00)?$", "");
+        }
+    }
+
+}
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
index c5031780..c239371e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
@@ -502,8 +502,6 @@ public enum StaticIndexEnum {
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
                 .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
-
-
         BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
         int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
                 // 待鉴定
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
index 0ffe2045..ff6d64ec 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
@@ -1,6 +1,7 @@
 package com.kms.yxgh.df.dto.v2;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
 import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +12,10 @@ import java.util.Date;
 
 @Data
 @ApiModel("堤防巡视检查记录检索条件v2")
-public class DfRecordSearchV2Dto {
+public class DfRecordSearchV2Dto implements IAdcdDeptRole {
+
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
 
     @ApiModelProperty("堤防名称")
     private String dikeName;
@@ -55,9 +59,8 @@ public class DfRecordSearchV2Dto {
 
     public String getDikeCode() {
         if (StringUtils.isEmpty(this.dikeCode)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.dikeCode =AuthorityDikeCodeService.getAuthorityDikeCode();
         }
-        return null;
+        return this.dikeCode;
     }
-
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java
index 871d588b..6e76b2e1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java
@@ -1,13 +1,20 @@
 package com.kms.yxgh.df.dto.v2;
 
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
+import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.util.StringUtils;
 
+/**
+ * @author lyd
+ */
 @Data
 @ApiModel(value = "堤防巡查项目查询v2")
-public class DfV2CheckingSearchDto {
-
+public class DfV2CheckingSearchDto implements IAdcdDeptRole {
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
     @ApiModelProperty(value = "堤防编号")
     private String dikeCode;
     @ApiModelProperty(value = "名称")
@@ -16,4 +23,11 @@ public class DfV2CheckingSearchDto {
     private String type;
     @ApiModelProperty("巡查类别")
     private String category;
+
+    public String getDikeCode() {
+        if (StringUtils.isEmpty(this.dikeCode)) {
+            this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
+        }
+        return this.dikeCode;
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java
index 6b8e3533..378970d3 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java
@@ -1,9 +1,15 @@
 package com.kms.yxgh.df.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.*;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.df.domain.DfCheckingProblemV2;
+import com.kms.yxgh.df.dto.v2.DfProblemV2Dto;
+import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
+import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
+import com.shuili.common.core.domain.SearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -19,6 +25,9 @@ import java.util.List;
 @Repository
 public interface DfCheckingProblemV2Mapper extends BaseMapper<DfCheckingProblemV2> {
 
+    IPage<DfProblemV2Dto> page(Page<DfCheckingProblemV2> page, @Param("data") DfRecordSearchV2Dto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_df_xcqx xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java
index f3b9a7df..95c69717 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java
@@ -1,11 +1,15 @@
 package com.kms.yxgh.df.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDateDto;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.df.domain.DfCheckingRecord;
+import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto;
+import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -21,6 +25,8 @@ import java.util.List;
 @Repository
 public interface DfCheckingRecordV2Mapper extends BaseMapper<DfCheckingRecord> {
 
+    IPage<DfRecordDetailV2Dto> page(Page<DfCheckingRecord> page, @Param("data") DfRecordSearchV2Dto dto);
+
 
     @Select("<script>" +
             "SELECT count(DISTINCT(jl.DIKE_CODE)) "+
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java
index e2452921..262db892 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java
@@ -1,9 +1,13 @@
 package com.kms.yxgh.df.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
+import com.kms.yxgh.df.dto.v2.DfV2CheckingDto;
+import com.kms.yxgh.df.dto.v2.DfV2CheckingSearchDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -19,6 +23,9 @@ import java.util.List;
 @Repository
 public interface DfCheckingV2Mapper extends BaseMapper<DfCheckingV2ProjectManage> {
 
+    IPage<DfV2CheckingDto> page(Page<DfCheckingV2ProjectManage> page, @Param("data") DfV2CheckingSearchDto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_df_xmgl xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java
index 17f7d4a1..2e0873a6 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java
@@ -7,6 +7,7 @@ import com.kms.yxgh.common.dto.*;
 import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
 import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
+import com.kms.yxgh.df.dto.v2.DfYhListV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -24,6 +25,7 @@ public interface DfYhV2Mapper extends BaseMapper<DfYhV2> {
 
     IPage<ApprovalDetailDto<DfYhApproveDto>> approvalSearchPage(Page<DfRecordSearchV2Dto> page, @Param("dto") ApprovalSearchDto<DfRecordSearchV2Dto> data);
 
+    IPage<DfYhListV2Dto> page(Page<DfYhV2> page, @Param("data") DfRecordSearchV2Dto dto);
 
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java
index f2a955de..72eb9b45 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java
@@ -29,16 +29,17 @@ public class AuthorityDikeCodeService {
 
     /**
      * 获取当前用户部门所属行政区划
-     * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码
+     * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码   implements IAdcd  本身已经实现
      *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤；
      * @return String
      */
     public static RoleJudgeDto getRoleDeptDistrictCode() {
 
-        SysDeptService sysDeptService = SpringUtils.getBean(SysDeptService.class);
         SysRoleService sysRoleService = SpringUtils.getBean(SysRoleService.class);
         DfSysUserRoleMapper dfSysUserRoleMapper = SpringUtils.getBean(DfSysUserRoleMapper.class);
         BsSgcDfManateamService bsSgcDfManateamService = SpringUtils.getBean(BsSgcDfManateamService.class);
+        SysDeptService sysDeptService = SpringUtils.getBean(SysDeptService.class);
+
 
         RoleJudgeDto dto=new RoleJudgeDto();
         SysUser user = UserUtils.getUser();
@@ -62,24 +63,27 @@ public class AuthorityDikeCodeService {
                     if (roleCodes.contains("YW00143")
                             || roleCodes.contains("YW00129")
                             || roleCodes.contains("YW00164")) {
-                        SysDept sysDept = sysDeptService.getById(user.getDeptId());
+                        SysDept sysDept = sysDeptService.getOne(
+                                new LambdaQueryWrapper<SysDept>()
+                                        .eq(!StringUtils.isEmpty(user.getDeptId()),SysDept::getId, user.getDeptId())
+                                        .orderByDesc(SysDept::getCreateTime)
+                                        .last(" limit 1 ")
+                        );
                         if (!Objects.isNull(sysDept)) {
-                            dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId())
-                                    ? null:sysDept.getXzqhId());
+                            dto.setXzqhId(sysDept.getXzqhId());
                             return dto;
                         }
                     }
                     if (roleCodes.contains("YW00352")
                             || roleCodes.contains("YW00402")) {
                         BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService
-                                .getById(new LambdaQueryWrapper<BsSgcDfManateam>()
+                                .getOne(new LambdaQueryWrapper<BsSgcDfManateam>()
                                         .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber())
                                         .orderByDesc(BsSgcDfManateam::getCreateTime)
                                         .last(" limit 1 ")
                                 );
                         if (!Objects.isNull(bsSgcDfManateam)) {
-                            dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode())
-                                    ? null:bsSgcDfManateam.getDikeCode());
+                            dto.setDikeCode(bsSgcDfManateam.getDikeCode());
                             return dto;
                         }
                     }
@@ -91,9 +95,11 @@ public class AuthorityDikeCodeService {
 
 
     public static String getAuthorityDikeCode() {
-        RoleJudgeDto roleDeptDistrictCode = getRoleDeptDistrictCode();
-        return StringUtils.isEmpty(roleDeptDistrictCode.getDikeCode())
-                ? null : roleDeptDistrictCode.getDikeCode();
+        return getRoleDeptDistrictCode().getDikeCode();
+    }
+
+    public static String getAuthorityXzqhCode() {
+        return getRoleDeptDistrictCode().getXzqhId();
     }
 
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
index 0b496733..f0f51d6c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
@@ -14,6 +14,7 @@ import com.kms.system.service.SysXzqhService;
 import com.kms.yg.df.domain.BsSgcDfManateam;
 import com.kms.yg.df.domain.dto.RoleJudgeDto;
 import com.kms.yg.df.service.BsSgcDfManateamService;
+import com.kms.yxgh.common.dto.ApprovalDetailDto;
 import com.kms.yxgh.df.domain.DfCheckingProblemV2;
 import com.kms.yxgh.df.domain.DfSysUserRole;
 import com.kms.yxgh.df.domain.DfYhV2;
@@ -60,59 +61,14 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
         }
         // 分页参数
         Page<DfCheckingProblemV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-
-        // 构建查询条件
-        LambdaQueryWrapper<DfCheckingProblemV2> queryWrapper = new LambdaQueryWrapper<DfCheckingProblemV2>();
-        Optional.ofNullable(data.getCategory())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(category -> queryWrapper.eq(DfCheckingProblemV2::getCategory, category));
-
-        Optional.ofNullable(data.getType())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(type -> queryWrapper.eq(DfCheckingProblemV2::getType, type));
-
-        Optional.ofNullable(data.getName())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(name -> queryWrapper.like(DfCheckingProblemV2::getCheckingName, name));
-
-        Optional.ofNullable(data.getDutyHolder())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(dutyHolder -> queryWrapper.like(DfCheckingProblemV2::getDutyHolderName, dutyHolder));
-
-        Optional.ofNullable(data.getStatus())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status));
-
-        if (!Objects.isNull(data.getStartDate())) {
-            queryWrapper.ge(DfCheckingProblemV2::getStartDate, data.getStartDate());
-        }
-
-        if (!Objects.isNull(data.getEndDate())) {
-            queryWrapper.le(DfCheckingProblemV2::getEndDate, data.getEndDate());
-        }
-        Optional.ofNullable(data.getProblemLevel())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(problemLevel -> queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, problemLevel));
-
-        Optional.ofNullable(data.getRecordId())
-                .filter(StringUtils::isBlank)
-                .ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getRecordId, recordId));
-
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()),DfCheckingProblemV2::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
-        queryWrapper.orderByDesc(DfCheckingProblemV2::getCreateTime);
-
         // 查询分页数据
-        Page<DfCheckingProblemV2> queryPage = page(page, queryWrapper);
+        IPage<DfProblemV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
-
         // 转换为 DTO 分页对象
         Page<DfProblemV2Dto> dtoPage = new Page<>();
         BeanUtils.copyProperties(queryPage, dtoPage);
-
         // 处理查询结果
         List<DfProblemV2Dto> vos = queryPage.getRecords().stream()
                 .map(record -> {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
index fb781ab3..4480f891 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
@@ -3,7 +3,6 @@ package com.kms.yxgh.df.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,8 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -47,47 +44,8 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
     public IPage<DfRecordDetailV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DfCheckingRecord> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DfRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DfCheckingRecord> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DfCheckingRecord::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DfCheckingRecord::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DfCheckingRecord::getCheckingName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(DfCheckingRecord::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(DfCheckingRecord::getStatus, status));
-
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(DfCheckingRecord::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(DfCheckingRecord::getEndDate, data.getEndDate());
-            }
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                ,DfCheckingRecord::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DfCheckingRecord::getCreateTime);
-
         // 查询分页数据
-        Page<DfCheckingRecord> queryPage = page(page, queryWrapper);
+        IPage<DfRecordDetailV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
index c0794102..2bf7a7e4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
@@ -3,11 +3,9 @@ package com.kms.yxgh.df.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kms.yxgh.df.domain.DfCheckingRecord;
 import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem;
 import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
 import com.kms.yxgh.df.dto.DfCheckingDetailDto;
@@ -36,42 +34,16 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
 
     private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
 
-    private  final  DfCheckingProblemV2Service dfCheckingProblemV2Service;
-
     public IPage<DfV2CheckingDto> list(SearchParam<DfV2CheckingSearchDto> sp) {
         // 分页参数
         Page<DfCheckingV2ProjectManage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DfV2CheckingSearchDto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DfCheckingV2ProjectManage> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DfCheckingV2ProjectManage::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DfCheckingV2ProjectManage::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DfCheckingV2ProjectManage::getName, name));
-        }
-
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                ,DfCheckingV2ProjectManage::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime);
-
         // 查询分页数据
-        Page<DfCheckingV2ProjectManage> queryPage = page(page, queryWrapper);
+        IPage<DfV2CheckingDto> queryPage =this.baseMapper.page(page,sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
-
         // 转换为 DTO 分页对象
-        Page<DfV2CheckingDto> dtoPage = new Page<>();
+        IPage<DfV2CheckingDto> dtoPage = new Page<>();
         BeanUtils.copyProperties(queryPage, dtoPage);
 
         // 处理查询结果
@@ -91,8 +63,6 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
         if (CollectionUtils.isEmpty(ids)) {
             return dtoPage;
         }
-
-
         List<DfCheckingV2ProjectItem> items = dfCheckingV2ProjectItemV2Service.list(
                 Wrappers.<DfCheckingV2ProjectItem>lambdaQuery()
                         .in(DfCheckingV2ProjectItem::getCheckingId, ids)
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
index 9083bcb5..694d5de1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.ApprovalStatusEnum;
@@ -19,7 +16,6 @@ import com.kms.yxgh.common.service.ApprovalService;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
 import com.kms.yxgh.df.domain.DfCheckingProblemV2;
 import com.kms.yxgh.df.domain.DfCheckingRecord;
-import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
 import com.kms.yxgh.df.domain.DfYhV2;
 import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
 import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
@@ -35,7 +31,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -61,63 +56,14 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
     public IPage<DfYhListV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DfYhV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DfRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DfYhV2> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DfYhV2::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DfYhV2::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DfYhV2::getName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(DfYhV2::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(DfYhV2::getStatus, status));
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(DfYhV2::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(DfYhV2::getEndDate, data.getEndDate());
-            }
-
-            if (StringUtils.isNotBlank(data.getProblemLevel())) {
-                queryWrapper.eq(DfYhV2::getProblemLevel, data.getProblemLevel());
-            }
-
-            Optional.ofNullable(data.getRecordId())
-                    .filter(StringUtils::isBlank)
-                    .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getRecordId, recordId));
-
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , DfYhV2::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DfYhV2::getCreateTime);
-
         // 查询分页数据
-        Page<DfYhV2> queryPage = page(page, queryWrapper);
+        IPage<DfYhListV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
-
         // 转换为 DTO 分页对象
         Page<DfYhListV2Dto> dtoPage = new Page<>();
         BeanUtils.copyProperties(queryPage, dtoPage);
-
         // 处理查询结果
         List<DfYhListV2Dto> vos = queryPage.getRecords().stream()
                 .map(record -> {
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
index 05dcfe6d..d4105a75 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
@@ -1,6 +1,7 @@
 package com.kms.yxgh.dw.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
 import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +12,7 @@ import java.util.Date;
 
 @Data
 @ApiModel("工程巡视检查记录检索条件v2")
-public class DwRecordSearchV2Dto {
+public class DwRecordSearchV2Dto implements IAdcdDeptRole {
 
     @ApiModelProperty("工程名称")
     private String dikeName;
@@ -53,10 +54,13 @@ public class DwRecordSearchV2Dto {
     @ApiModelProperty(value = "堤防编码")
     private String dikeCode;
 
-    public String getCode() {
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
+
+    public String getDikeCode() {
         if (StringUtils.isEmpty(this.dikeCode)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.dikeCode =AuthorityDikeCodeService.getAuthorityDikeCode();
         }
-        return null;
+        return this.dikeCode;
     }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingSearchDto.java
index f2f32e7c..bf2c875c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwV2CheckingSearchDto.java
@@ -1,13 +1,16 @@
 package com.kms.yxgh.dw.dto;
-
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
+import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+import org.springframework.util.StringUtils;
 @Data
 @ApiModel(value = "工程巡查项目查询v2")
-public class DwV2CheckingSearchDto {
+public class DwV2CheckingSearchDto implements IAdcdDeptRole {
 
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
     @ApiModelProperty(value = "工程编号")
     private String dikeCode;
     @ApiModelProperty(value = "名称")
@@ -16,4 +19,11 @@ public class DwV2CheckingSearchDto {
     private String type;
     @ApiModelProperty("巡查类别")
     private String category;
+
+    public String getDikeCode() {
+        if (StringUtils.isEmpty(this.dikeCode)) {
+            this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode();
+        }
+        return this.dikeCode;
+    }
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java
index 802974e1..7b20b970 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java
@@ -1,11 +1,15 @@
 package com.kms.yxgh.dw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDateDto;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
+import com.kms.yxgh.dw.dto.DwProblemV2Dto;
+import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -21,6 +25,9 @@ import java.util.List;
 @Repository
 public interface DwCheckingProblemV2Mapper extends BaseMapper<DwCheckingProblemV2> {
 
+    IPage<DwProblemV2Dto> page(Page<DwCheckingProblemV2> page, @Param("data") DwRecordSearchV2Dto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xcqx xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java
index 015b8a6e..00e7adb2 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingRecordV2Mapper.java
@@ -1,11 +1,15 @@
 package com.kms.yxgh.dw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDateDto;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.dw.domain.DwCheckingRecord;
+import com.kms.yxgh.dw.dto.DwRecordDetailV2Dto;
+import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -20,6 +24,7 @@ import java.util.List;
  */
 @Repository
 public interface DwCheckingRecordV2Mapper extends BaseMapper<DwCheckingRecord> {
+    IPage<DwRecordDetailV2Dto> page(Page<DwCheckingRecord> page, @Param("data") DwRecordSearchV2Dto dto);
 
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingV2Mapper.java
index 4221ccd4..6636661d 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingV2Mapper.java
@@ -1,10 +1,13 @@
 package com.kms.yxgh.dw.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
-import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
 import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage;
+import com.kms.yxgh.dw.dto.DwV2CheckingDto;
+import com.kms.yxgh.dw.dto.DwV2CheckingSearchDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -20,6 +23,8 @@ import java.util.List;
 @Repository
 public interface DwCheckingV2Mapper extends BaseMapper<DwCheckingV2ProjectManage> {
 
+    IPage<DwV2CheckingDto> page(Page<DwCheckingV2ProjectManage> page, @Param("data") DwV2CheckingSearchDto dto);
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_dw_xmgl xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwYhV2Mapper.java
index 264fd6eb..6ad4a9e5 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwYhV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwYhV2Mapper.java
@@ -1,5 +1,4 @@
 package com.kms.yxgh.dw.mapper;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +6,7 @@ import com.kms.yxgh.common.dto.*;
 import com.kms.yxgh.dw.domain.DwYhV2;
 import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
 import com.kms.yxgh.dw.dto.DwYhApproveDto;
+import com.kms.yxgh.dw.dto.DwYhListV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -24,6 +24,8 @@ public interface DwYhV2Mapper extends BaseMapper<DwYhV2> {
 
     IPage<ApprovalDetailDto<DwYhApproveDto>> approvalSearchPage(Page<DwRecordSearchV2Dto> page, @Param("dto") ApprovalSearchDto<DwRecordSearchV2Dto> data);
 
+    IPage<DwYhListV2Dto> page(Page<DwYhV2> page, @Param("data") DwRecordSearchV2Dto dto);
+
 
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java
index 06ddbe7a..07195486 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java
@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.df.domain.DfCheckingV2ProjectManage;
-import com.kms.yxgh.df.domain.DfYhV2;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
 import com.kms.yxgh.dw.domain.DwYhV2;
 import com.kms.yxgh.dw.dto.DwProblemV2Dto;
@@ -20,14 +17,9 @@ import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.BeanUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static com.kms.yxgh.common.enums.DfYhV2StatusEnum.DURING_INSPECTION;
-
 /**
  * 项目管理记录
  *
@@ -48,53 +40,8 @@ public class DwCheckingProblemV2Service extends BaseService<DwCheckingProblemV2M
         }
         // 分页参数
         Page<DwCheckingProblemV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-
-        // 构建查询条件
-        LambdaQueryWrapper<DwCheckingProblemV2> queryWrapper = new LambdaQueryWrapper<DwCheckingProblemV2>();
-
-        Optional.ofNullable(data.getCategory())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(category -> queryWrapper.eq(DwCheckingProblemV2::getCategory, category));
-
-        Optional.ofNullable(data.getType())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(type -> queryWrapper.eq(DwCheckingProblemV2::getType, type));
-
-        Optional.ofNullable(data.getName())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(name -> queryWrapper.like(DwCheckingProblemV2::getCheckingName, name));
-
-        Optional.ofNullable(data.getDutyHolder())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(dutyHolder -> queryWrapper.like(DwCheckingProblemV2::getDutyHolderName, dutyHolder));
-
-        Optional.ofNullable(data.getStatus())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(status -> queryWrapper.like(DwCheckingProblemV2::getStatus, status));
-
-        if (!Objects.isNull(data.getStartDate())) {
-            queryWrapper.ge(DwCheckingProblemV2::getStartDate, data.getStartDate());
-        }
-
-        if (!Objects.isNull(data.getEndDate())) {
-            queryWrapper.le(DwCheckingProblemV2::getEndDate, data.getEndDate());
-        }
-        Optional.ofNullable(data.getProblemLevel())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(problemLevel -> queryWrapper.eq(DwCheckingProblemV2::getProblemLevel, problemLevel));
-
-        Optional.ofNullable(data.getRecordId())
-                .filter(StringUtils::isBlank)
-                .ifPresent(recordId -> queryWrapper.eq(DwCheckingProblemV2::getRecordId, recordId));
-
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , DwCheckingProblemV2::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.ne(DwCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
-        queryWrapper.orderByDesc(DwCheckingProblemV2::getCreateTime);
-
         // 查询分页数据
-        Page<DwCheckingProblemV2> queryPage = page(page, queryWrapper);
+        IPage<DwProblemV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java
index e229fcc7..d82b73af 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java
@@ -3,12 +3,10 @@ package com.kms.yxgh.dw.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.dw.domain.*;
 import com.kms.yxgh.dw.domain.DwCheckingRecord;
 import com.kms.yxgh.dw.dto.DwRecordDetailV2Dto;
@@ -21,11 +19,8 @@ import com.shuili.common.utils.BeanUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -48,46 +43,8 @@ public class DwCheckingRecordV2Service extends BaseService<DwCheckingRecordV2Map
     public IPage<DwRecordDetailV2Dto> list(SearchParam<DwRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DwCheckingRecord> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DwRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DwCheckingRecord> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DwCheckingRecord::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DwCheckingRecord::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DwCheckingRecord::getCheckingName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(DwCheckingRecord::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(DwCheckingRecord::getStatus, status));
-
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(DwCheckingRecord::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(DwCheckingRecord::getEndDate, data.getEndDate());
-            }
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , DwCheckingRecord::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DwCheckingRecord::getCreateTime);
         // 查询分页数据
-        Page<DwCheckingRecord> queryPage = page(page, queryWrapper);
+        IPage<DwRecordDetailV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
index 83d70439..37e1b7a1 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
@@ -3,15 +3,11 @@ package com.kms.yxgh.dw.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.df.service.DfCheckingV2Service;
-import com.kms.yxgh.dw.domain.DwCheckingRecord;
 import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem;
 import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage;
-
 import com.kms.yxgh.dw.dto.DwCheckingDetailDto;
 import com.kms.yxgh.dw.dto.DwV2CheckingDto;
 import com.kms.yxgh.dw.dto.DwV2CheckingSearchDto;
@@ -42,30 +38,8 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
     public IPage<DwV2CheckingDto> list(SearchParam<DwV2CheckingSearchDto> sp) {
         // 分页参数
         Page<DwCheckingV2ProjectManage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DwV2CheckingSearchDto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DwCheckingV2ProjectManage> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DwCheckingV2ProjectManage::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DwCheckingV2ProjectManage::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DwCheckingV2ProjectManage::getName, name));
-        }
-        queryWrapper.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , DwCheckingV2ProjectManage::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime);
-
         // 查询分页数据
-        Page<DwCheckingV2ProjectManage> queryPage = page(page, queryWrapper);
+        IPage<DwV2CheckingDto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
@@ -91,8 +65,6 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
         if (CollectionUtils.isEmpty(ids)) {
             return dtoPage;
         }
-
-
         List<DwCheckingV2ProjectItem> items = dwCheckingV2ProjectItemV2Service.list(
                 Wrappers.<DwCheckingV2ProjectItem>lambdaQuery()
                         .in(DwCheckingV2ProjectItem::getCheckingId, ids)
diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java
index 62e910dd..7be7208c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java
@@ -3,9 +3,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.ApprovalStatusEnum;
@@ -16,10 +13,8 @@ import com.kms.yxgh.common.dto.DocV2Dto;
 import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.common.service.ApprovalService;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
 import com.kms.yxgh.dw.domain.DwCheckingRecord;
-import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage;
 import com.kms.yxgh.dw.domain.DwYhV2;
 import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
 import com.kms.yxgh.dw.dto.DwYhApproveDto;
@@ -59,55 +54,8 @@ public class DwYhV2Service extends DefaultApprovalBusinessService<DwYhV2Mapper,
     public IPage<DwYhListV2Dto> list(SearchParam<DwRecordSearchV2Dto> sp) {
         // 分页参数
         Page<DwYhV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DwRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<DwYhV2> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(DwYhV2::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(DwYhV2::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(DwYhV2::getName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(DwYhV2::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(DwYhV2::getStatus, status));
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(DwYhV2::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(DwYhV2::getEndDate, data.getEndDate());
-            }
-
-            if (StringUtils.isNotBlank(data.getProblemLevel())) {
-                queryWrapper.eq(DwYhV2::getProblemLevel, data.getProblemLevel());
-            }
-
-            Optional.ofNullable(data.getRecordId())
-                    .filter(StringUtils::isBlank)
-                    .ifPresent(recordId -> queryWrapper.eq(DwYhV2::getRecordId, recordId));
-
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , DwYhV2::getDikeCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(DwYhV2::getCreateTime);
-
         // 查询分页数据
-        Page<DwYhV2> queryPage = page(page, queryWrapper);
+        IPage<DwYhListV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
@@ -129,7 +77,6 @@ public class DwYhV2Service extends DefaultApprovalBusinessService<DwYhV2Mapper,
         return dtoPage;
     }
 
-
     public DwYhDetailV2Dto getInfo(String id) {
         DwYhDetailV2Dto dto = new DwYhDetailV2Dto();
         DwYhV2 dfYhV2 = getById(id);
@@ -140,7 +87,6 @@ public class DwYhV2Service extends DefaultApprovalBusinessService<DwYhV2Mapper,
         return dto;
     }
 
-
     public Boolean myRemove(String[] ids) {
         if (null != ids && ids.length > 0) {
             return remove(new LambdaQueryWrapper<DwYhV2>()
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
index 7ebe8042..fadab077 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
@@ -1,6 +1,7 @@
 package com.kms.yxgh.sz.dto.v2;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
 import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +12,10 @@ import java.util.Date;
 
 @Data
 @ApiModel("水闸巡视检查记录检索条件v2")
-public class SzRecordSearchV2Dto {
+public class SzRecordSearchV2Dto implements IAdcdDeptRole {
+
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
 
     @ApiModelProperty("水闸名称")
     private String wagaName;
@@ -55,7 +59,7 @@ public class SzRecordSearchV2Dto {
 
     public String getWagaCode() {
         if (StringUtils.isEmpty(this.wagaCode)) {
-            return AuthorityDikeCodeService.getAuthorityDikeCode();
+            this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode();
         }
         return this.wagaCode;
     }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java
index 45b94501..8a1adb57 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzV2CheckingSearchDto.java
@@ -1,12 +1,13 @@
 package com.kms.yxgh.sz.dto.v2;
-
+import com.kms.yxgh.common.dto.IAdcdDeptRole;
+import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+import org.springframework.util.StringUtils;
 @Data
 @ApiModel(value = "水闸巡查项目查询v2")
-public class SzV2CheckingSearchDto {
+public class SzV2CheckingSearchDto implements IAdcdDeptRole {
 
     @ApiModelProperty(value = "水闸编号")
     private String wagaCode;
@@ -16,4 +17,14 @@ public class SzV2CheckingSearchDto {
     private String type;
     @ApiModelProperty("类别")
     private String category;
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
+
+    public String getDikeCode() {
+        if (StringUtils.isEmpty(this.wagaCode)) {
+            this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode();
+        }
+        return this.wagaCode;
+    }
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java
index abe0b910..08e548ee 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java
@@ -1,11 +1,16 @@
 package com.kms.yxgh.sz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDateDto;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
+import com.kms.yxgh.sz.dto.v2.SzProblemV2Dto;
+import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
+import com.shuili.common.core.domain.SearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -21,6 +26,10 @@ import java.util.List;
 @Repository
 public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV2> {
 
+
+    IPage<SzProblemV2Dto> page(Page<SzCheckingProblemV2> page, @Param("data") SzRecordSearchV2Dto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_sz_xcqx xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java
index b55fe431..3d0312e3 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java
@@ -1,11 +1,15 @@
 package com.kms.yxgh.sz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDateDto;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.common.enums.PatrolMaintenanceCategory;
 import com.kms.yxgh.sz.domain.SzCheckingRecord;
+import com.kms.yxgh.sz.dto.v2.SzRecordDetailV2Dto;
+import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -21,6 +25,9 @@ import java.util.List;
 @Repository
 public interface SzCheckingRecordV2Mapper extends BaseMapper<SzCheckingRecord> {
 
+    IPage<SzRecordDetailV2Dto> page(Page<SzCheckingRecord> page, @Param("data") SzRecordSearchV2Dto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_sz_xsxcjl xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingV2Mapper.java
index 8b7a9204..d57b3745 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingV2Mapper.java
@@ -1,9 +1,13 @@
 package com.kms.yxgh.sz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.dto.CountDto;
 import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage;
+import com.kms.yxgh.sz.dto.v2.SzV2CheckingDto;
+import com.kms.yxgh.sz.dto.v2.SzV2CheckingSearchDto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -19,6 +23,9 @@ import java.util.List;
 @Repository
 public interface SzCheckingV2Mapper extends BaseMapper<SzCheckingV2ProjectManage> {
 
+    IPage<SzV2CheckingDto> page(Page<SzCheckingV2ProjectManage> page, @Param("data") SzV2CheckingSearchDto dto);
+
+
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
             "from bs_sgc_sz_xmgl xm " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java
index e9e504e1..bb8b6031 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java
@@ -11,6 +11,7 @@ import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
 import com.kms.yxgh.sz.domain.SzYhV2;
 import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
 import com.kms.yxgh.sz.dto.v2.SzYhApproveDto;
+import com.kms.yxgh.sz.dto.v2.SzYhListV2Dto;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -28,6 +29,8 @@ public interface SzYhV2Mapper extends BaseMapper<SzYhV2> {
 
     IPage<ApprovalDetailDto<SzYhApproveDto>> approvalSearchPage(Page<SzRecordSearchV2Dto> page, @Param("dto") ApprovalSearchDto<SzRecordSearchV2Dto> data);
 
+    IPage<SzYhListV2Dto> page(Page<SzYhV2> page, @Param("data") SzRecordSearchV2Dto dto);
+
 
     @Select("<script> " +
             "select base.adcd code ,count(1) sum  " +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java
index 1375576b..fcdc7988 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java
@@ -50,50 +50,8 @@ public class SzCheckingProblemV2Service extends BaseService<SzCheckingProblemV2M
         }
         // 分页参数
         Page<SzCheckingProblemV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        // 构建查询条件
-        LambdaQueryWrapper<SzCheckingProblemV2> queryWrapper = new LambdaQueryWrapper<SzCheckingProblemV2>();
-        Optional.ofNullable(data.getCategory())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(category -> queryWrapper.eq(SzCheckingProblemV2::getCategory, category));
-
-        Optional.ofNullable(data.getType())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(type -> queryWrapper.eq(SzCheckingProblemV2::getType, type));
-
-        Optional.ofNullable(data.getName())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(name -> queryWrapper.like(SzCheckingProblemV2::getCheckingName, name));
-
-        Optional.ofNullable(data.getDutyHolder())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(dutyHolder -> queryWrapper.like(SzCheckingProblemV2::getDutyHolderName, dutyHolder));
-
-        Optional.ofNullable(data.getStatus())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(status -> queryWrapper.like(SzCheckingProblemV2::getStatus, status));
-
-        if (!Objects.isNull(data.getStartDate())) {
-            queryWrapper.ge(SzCheckingProblemV2::getStartDate, data.getStartDate());
-        }
-
-        if (!Objects.isNull(data.getEndDate())) {
-            queryWrapper.le(SzCheckingProblemV2::getEndDate, data.getEndDate());
-        }
-        Optional.ofNullable(data.getProblemLevel())
-                .filter(StringUtils::isNotBlank)
-                .ifPresent(problemLevel -> queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, problemLevel));
-
-        Optional.ofNullable(data.getRecordId())
-                .filter(StringUtils::isBlank)
-                .ifPresent(recordId -> queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, recordId));
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , SzCheckingProblemV2::getWagaCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.ne(SzCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
-        queryWrapper.orderByDesc(SzCheckingProblemV2::getCreateTime);
-
         // 查询分页数据
-        Page<SzCheckingProblemV2> queryPage = page(page, queryWrapper);
+        IPage<SzProblemV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java
index fa892f90..2423bb0a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java
@@ -3,11 +3,9 @@ package com.kms.yxgh.sz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.common.enums.DfYhV2StatusEnum;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.df.service.DfCheckingV2Service;
 import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
 import com.kms.yxgh.sz.domain.SzCheckingRecord;
@@ -22,11 +20,8 @@ import com.shuili.common.utils.BeanUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -49,51 +44,12 @@ public class SzCheckingRecordV2Service extends BaseService<SzCheckingRecordV2Map
     public IPage<SzRecordDetailV2Dto> list(SearchParam<SzRecordSearchV2Dto> sp) {
         // 分页参数
         Page<SzCheckingRecord> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        SzRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<SzCheckingRecord> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(SzCheckingRecord::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(SzCheckingRecord::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(SzCheckingRecord::getCheckingName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(SzCheckingRecord::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(SzCheckingRecord::getStatus, status));
 
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(SzCheckingRecord::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(SzCheckingRecord::getEndDate, data.getEndDate());
-            }
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , SzCheckingRecord::getWagaCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(SzCheckingRecord::getCreateTime);
         // 查询分页数据
-        Page<SzCheckingRecord> queryPage = page(page, queryWrapper);
+        IPage<SzRecordDetailV2Dto> queryPage = this.baseMapper.page(page,sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
-
-        // 转换为 DTO 分页对象
         Page<SzRecordDetailV2Dto> dtoPage = new Page<>();
         BeanUtils.copyProperties(queryPage, dtoPage);
 
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
index 1b48da4e..db31169e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
@@ -2,12 +2,9 @@ package com.kms.yxgh.sz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.df.service.DfCheckingV2Service;
-import com.kms.yxgh.sz.domain.SzCheckingRecord;
 import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem;
 import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage;
 import com.kms.yxgh.sz.dto.v2.SzCheckingDetailDto;
@@ -37,29 +34,8 @@ public class SzCheckingV2Service extends BaseService<SzCheckingV2Mapper, SzCheck
     public IPage<SzV2CheckingDto> list(SearchParam<SzV2CheckingSearchDto> sp) {
         // 分页参数
         Page<SzCheckingV2ProjectManage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        SzV2CheckingSearchDto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<SzCheckingV2ProjectManage> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(SzCheckingV2ProjectManage::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(SzCheckingV2ProjectManage::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(SzCheckingV2ProjectManage::getName, name));
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , SzCheckingV2ProjectManage::getWagaCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime);
         // 查询分页数据
-        Page<SzCheckingV2ProjectManage> queryPage = page(page, queryWrapper);
+        IPage<SzV2CheckingDto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
index 6da6ac41..54a09446 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
@@ -3,9 +3,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.common.ApprovalStatusEnum;
@@ -16,11 +13,9 @@ import com.kms.yxgh.common.dto.DocV2Dto;
 import com.kms.yxgh.common.enums.DfYhV2StatusEnum;
 import com.kms.yxgh.common.service.ApprovalService;
 import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
-import com.kms.yxgh.df.service.AuthorityDikeCodeService;
 import com.kms.yxgh.df.service.DfCheckingV2Service;
 import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
 import com.kms.yxgh.sz.domain.SzCheckingRecord;
-import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage;
 import com.kms.yxgh.sz.domain.SzYhV2;
 import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
 import com.kms.yxgh.sz.dto.v2.SzYhApproveDto;
@@ -35,7 +30,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -62,54 +56,8 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
     public IPage<SzYhListV2Dto> list(SearchParam<SzRecordSearchV2Dto> sp) {
         // 分页参数
         Page<SzYhV2> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        SzRecordSearchV2Dto data = sp.getData();
-
-        // 构建查询条件
-        LambdaQueryWrapper<SzYhV2> queryWrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(data)) {
-            Optional.ofNullable(data.getCategory())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(category -> queryWrapper.eq(SzYhV2::getCategory, category));
-
-            Optional.ofNullable(data.getType())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(type -> queryWrapper.eq(SzYhV2::getType, type));
-
-            Optional.ofNullable(data.getName())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(name -> queryWrapper.like(SzYhV2::getName, name));
-
-            Optional.ofNullable(data.getDutyHolder())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(dutyHolder -> queryWrapper.like(SzYhV2::getDutyHolderName, dutyHolder));
-
-            Optional.ofNullable(data.getStatus())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(status -> queryWrapper.like(SzYhV2::getStatus, status));
-
-            if (!Objects.isNull(data.getStartDate())) {
-                queryWrapper.ge(SzYhV2::getStartDate, data.getStartDate());
-            }
-
-            if (!Objects.isNull(data.getEndDate())) {
-                queryWrapper.le(SzYhV2::getEndDate, data.getEndDate());
-            }
-
-            Optional.ofNullable(data.getProblemLevel())
-                    .filter(StringUtils::isNotBlank)
-                    .ifPresent(problemLevel -> queryWrapper.eq(SzYhV2::getProblemLevel, problemLevel));
-
-            Optional.ofNullable(data.getRecordId())
-                    .filter(StringUtils::isBlank)
-                    .ifPresent(recordId -> queryWrapper.eq(SzYhV2::getRecordId, recordId));
-
-        }
-        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
-                , SzYhV2::getWagaCode
-                , AuthorityDikeCodeService.getAuthorityDikeCode());
-        queryWrapper.orderByDesc(SzYhV2::getCreateTime);
         // 查询分页数据
-        Page<SzYhV2> queryPage = page(page, queryWrapper);
+        IPage<SzYhListV2Dto> queryPage = this.baseMapper.page(page, sp.getData());
         if (queryPage == null) {
             return new Page<>();
         }
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfCheckingV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfCheckingV2Mapper.xml
new file mode 100644
index 00000000..63e46a9f
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DfCheckingV2Mapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.df.mapper.DfCheckingV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.df.dto.v2.DfV2CheckingDto">
+        <id property="id" column="id"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="category" column="category"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+            xmgl.id,
+            xmgl.dike_code ,
+            xmgl.dike_name ,
+            xmgl.type,
+            xmgl.name,
+            xmgl.create_time,
+            xmgl.category ,
+            xmgl.create_uid,
+            xmgl.create_name
+        from
+            bs_sgc_df_xmgl xmgl
+        left join att_dike_base base on base.dike_code=xmgl.dike_code
+        where 1=1
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and xmgl.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and xmgl.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and xmgl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and xmgl.name like concat('%',#{data.name}, '%')
+        </if>
+        order by xmgl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfProblemV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfProblemV2Mapper.xml
new file mode 100644
index 00000000..6962023b
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DfProblemV2Mapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.df.dto.v2.DfProblemV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="parts" column="parts"/>
+        <result property="status" column="status"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="dutyHolderId" column="duty_holder_id"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="content" column="content"/>
+        <result property="position" column="position"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="doc" column="doc"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        qx.id ,
+        qx.checking_id ,
+        qx.record_id ,
+        qx.parts ,
+        qx.status ,
+        qx.checking_name ,
+        qx.type ,
+        qx.category ,
+        qx.duty_holder_name ,
+        qx.duty_holder_id ,
+        qx.dike_code ,
+        qx.dike_name ,
+        qx.start_date ,
+        qx.end_date  ,
+        qx.content ,
+        qx.position ,
+        qx.problem_level ,
+        qx.doc
+        from bs_sgc_df_xcqx qx
+        left join att_dike_base base on base.dike_code=qx.dike_code
+        where 1=1
+        and qx.status != '1'
+        <if test="data.startDate != null">
+            and qx.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and qx.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and qx.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and qx.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and qx.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and qx.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and qx.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and qx.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.recordId != null and data.recordId != ''">
+            and qx.record_id = #{data.recordId}
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and qx.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by qx.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfRecordV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfRecordV2Mapper.xml
new file mode 100644
index 00000000..61ea07f2
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DfRecordV2Mapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="status" column="status"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="scope" column="scope"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        jl.id ,
+        jl.checking_id ,
+        jl.checking_name ,
+        jl.dike_code ,
+        jl.dike_name ,
+        jl.status ,
+        jl.type ,
+        jl.category ,
+        jl.start_date ,
+        jl.end_date ,
+        jl.scope ,
+        jl.create_uid ,
+        jl.create_name
+        from  bs_sgc_df_xsxcjl jl
+        left join att_dike_base base on base.dike_code=jl.dike_code
+        where 1=1
+        <if test="data.startDate != null">
+            and jl.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and jl.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and jl.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and jl.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and jl.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and jl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and jl.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and jl.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by jl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
index 22ad9340..0dd89db8 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
@@ -27,8 +27,10 @@
         </association>
     </resultMap>
 
+
     <select id="approvalSearchPage" resultMap="approvalMap">
-        SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status,
+        SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status
+        status,
         ts.operator operator, ts.comment comment, ts.doc ts_doc,
         jl.id , jl.name ,jl.dike_code , jl.dike_name , jl.type type, jl.category ,
         jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status
@@ -71,4 +73,70 @@
     </select>
 
 
+    <resultMap id="pageMap" type="com.kms.yxgh.df.dto.v2.DfYhListV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="problemId" column="problem_id"/>
+        <result property="status" column="status"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="recordId" column="record_id"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        yh.id ,
+        yh.checking_id ,
+        yh.problem_id ,
+        yh.status ,
+        yh.name ,
+        yh.type ,
+        yh.category ,
+        yh.dike_code ,
+        yh.dike_name ,
+        yh.start_date ,
+        yh.problem_level ,
+        yh.duty_holder_name ,
+        yh.record_id
+        from bs_sgc_df_xcyj yh
+        left join att_dike_base base on base.dike_code=yh.dike_code
+        where 1=1
+        <if test="data.startDate != null">
+            and yh.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and yh.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and yh.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and yh.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and yh.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and yh.type = #{data.type}
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and yh.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and yh.name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and yh.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by yh.create_time desc
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
new file mode 100644
index 00000000..a5bcd9c9
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DwCheckingV2Mapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.dw.mapper.DwCheckingV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.dw.dto.DwV2CheckingDto">
+        <id property="id" column="id"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="category" column="category"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+            xmgl.id,
+            xmgl.dike_code ,
+            xmgl.dike_name ,
+            xmgl.type ,
+            xmgl.name ,
+            xmgl.create_time ,
+            xmgl.category ,
+            xmgl.create_uid ,
+            xmgl.create_name
+        from
+            bs_sgc_dw_xmgl xmgl
+        left join att_dike_base base on base.dike_code=xmgl.dike_code
+        where 1=1
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and xmgl.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and xmgl.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and xmgl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and xmgl.name like concat('%',#{data.name}, '%')
+        </if>
+        order by xmgl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwProblemV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwProblemV2Mapper.xml
new file mode 100644
index 00000000..f4983823
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DwProblemV2Mapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.dw.mapper.DwCheckingProblemV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.dw.dto.DwProblemV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="parts" column="parts"/>
+        <result property="status" column="status"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="dutyHolderId" column="duty_holder_id"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="content" column="content"/>
+        <result property="position" column="position"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="doc" column="doc"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        qx.id ,
+        qx.checking_id ,
+        qx.record_id ,
+        qx.parts ,
+        qx.status ,
+        qx.checking_name ,
+        qx.type ,
+        qx.category ,
+        qx.duty_holder_name ,
+        qx.duty_holder_id ,
+        qx.dike_code ,
+        qx.dike_name ,
+        qx.start_date ,
+        qx.end_date  ,
+        qx.content ,
+        qx.position ,
+        qx.problem_level ,
+        qx.doc
+        from bs_sgc_dw_xcqx qx
+        left join att_dike_base base on base.dike_code=qx.dike_code
+        where 1=1
+        and qx.status != '1'
+        <if test="data.startDate != null">
+            and qx.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and qx.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and qx.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and qx.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and qx.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and qx.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and qx.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and qx.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.recordId != null and data.recordId != ''">
+            and qx.record_id = #{data.recordId}
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and qx.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by qx.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwRecordV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwRecordV2Mapper.xml
new file mode 100644
index 00000000..9e507381
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/DwRecordV2Mapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.dw.dto.DwRecordDetailV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="status" column="status"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="scope" column="scope"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        jl.id ,
+        jl.checking_id ,
+        jl.checking_name ,
+        jl.dike_code ,
+        jl.dike_name ,
+        jl.status ,
+        jl.type ,
+        jl.category ,
+        jl.start_date ,
+        jl.end_date ,
+        jl.scope ,
+        jl.create_uid ,
+        jl.create_name
+        from  bs_sgc_dw_xsxcjl jl
+        left join att_dike_base base on base.dike_code=jl.dike_code
+        where 1=1
+        <if test="data.startDate != null">
+            and jl.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and jl.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and jl.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and jl.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and jl.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and jl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and jl.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and jl.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by jl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
index 64a578b9..ec229512 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
@@ -71,4 +71,73 @@
     </select>
 
 
+
+
+    <resultMap id="pageMap" type="com.kms.yxgh.dw.dto.DwYhListV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="problemId" column="problem_id"/>
+        <result property="status" column="status"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="dikeCode" column="dike_code"/>
+        <result property="dikeName" column="dike_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="recordId" column="record_id"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        yh.id ,
+        yh.checking_id ,
+        yh.problem_id ,
+        yh.status ,
+        yh.name ,
+        yh.type ,
+        yh.category ,
+        yh.dike_code ,
+        yh.dike_name ,
+        yh.start_date ,
+        yh.problem_level ,
+        yh.duty_holder_name ,
+        yh.record_id
+        from bs_sgc_dw_xcyj yh
+        left join att_dike_base base on base.dike_code=yh.dike_code
+        where 1=1
+        <if test="data.startDate != null">
+            and yh.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and yh.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and yh.category = #{data.category}
+        </if>
+        <if test="data.dikeCode != null and data.dikeCode != ''">
+            and yh.dike_code = #{data.dikeCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and yh.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and yh.type = #{data.type}
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and yh.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and yh.name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and yh.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by yh.create_time desc
+    </select>
+
+
 </mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
new file mode 100644
index 00000000..de11336a
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/SzCheckingV2Mapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.sz.mapper.SzCheckingV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.sz.dto.v2.SzV2CheckingDto">
+        <id property="id" column="id"/>
+        <result property="wagaCode" column="waga_code"/>
+        <result property="wagaName" column="waga_name"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="category" column="category"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+            xmgl.id,
+            xmgl.waga_code ,
+            xmgl.waga_name ,
+            xmgl.type ,
+            xmgl.name ,
+            xmgl.create_time ,
+            xmgl.category ,
+            xmgl.create_uid ,
+            xmgl.create_name
+        from
+            bs_sgc_sz_xmgl xmgl
+        left join att_waga_base base on base.waga_code=xmgl.waga_code
+        where 1=1
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and xmgl.category = #{data.category}
+        </if>
+        <if test="data.wagaCode != null and data.wagaCode != ''">
+            and xmgl.waga_code = #{data.wagaCode}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and xmgl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and xmgl.name like concat('%',#{data.name}, '%')
+        </if>
+        order by xmgl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzProblemV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzProblemV2Mapper.xml
new file mode 100644
index 00000000..a533df01
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/SzProblemV2Mapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.sz.mapper.SzCheckingProblemV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.sz.dto.v2.SzProblemV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="parts" column="parts"/>
+        <result property="status" column="status"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="dutyHolderId" column="duty_holder_id"/>
+        <result property="wagaCode" column="waga_code"/>
+        <result property="wagaName" column="waga_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="content" column="content"/>
+        <result property="position" column="position"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="doc" column="doc"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        qx.id ,
+        qx.checking_id ,
+        qx.record_id ,
+        qx.parts ,
+        qx.status ,
+        qx.checking_name ,
+        qx.type ,
+        qx.category ,
+        qx.duty_holder_name ,
+        qx.duty_holder_id ,
+        qx.waga_code ,
+        qx.waga_name ,
+        qx.start_date ,
+        qx.end_date  ,
+        qx.content ,
+        qx.position ,
+        qx.problem_level ,
+        qx.doc
+        from bs_sgc_sz_xcqx qx
+        left join att_waga_base base on base.waga_code=qx.waga_code
+        where 1=1
+        and qx.status != '1'
+        <if test="data.startDate != null">
+            and qx.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and qx.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and qx.category = #{data.category}
+        </if>
+        <if test="data.wagaCode != null and data.wagaCode != ''">
+            and qx.waga_code = #{data.wagaCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and qx.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and qx.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and qx.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and qx.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.recordId != null and data.recordId != ''">
+            and qx.record_id = #{data.recordId}
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and qx.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by qx.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordV2Mapper.xml
new file mode 100644
index 00000000..b9d718d7
--- /dev/null
+++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhRecordV2Mapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kms.yxgh.sz.mapper.SzCheckingRecordV2Mapper">
+
+    <resultMap id="pageMap" type="com.kms.yxgh.sz.dto.v2.SzRecordDetailV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="checkingName" column="checking_name"/>
+        <result property="wagaCode" column="waga_code"/>
+        <result property="wagaName" column="waga_name"/>
+        <result property="status" column="status"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="scope" column="scope"/>
+        <result property="createUid" column="create_uid"/>
+        <result property="createName" column="create_name"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        jl.id ,
+        jl.checking_id ,
+        jl.checking_name ,
+        jl.waga_code ,
+        jl.waga_name ,
+        jl.status ,
+        jl.type ,
+        jl.category ,
+        jl.start_date ,
+        jl.end_date ,
+        jl.scope ,
+        jl.create_uid ,
+        jl.create_name
+        from  bs_sgc_sz_xsxcjl jl
+        left join att_waga_base base on base.waga_code=jl.waga_code
+        where 1=1
+        <if test="data.startDate != null">
+            and jl.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and jl.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and jl.category = #{data.category}
+        </if>
+        <if test="data.wagaCode != null and data.wagaCode != ''">
+            and jl.waga_code = #{data.wagaCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and jl.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and jl.type = #{data.type}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and jl.checking_name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and jl.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by jl.create_time desc
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml
index 03d01220..dc474b3f 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml
@@ -8,6 +8,8 @@
         <result property="submitTime" column="submit_time"/>
         <result property="approvalTime" column="approval_time"/>
         <result property="status" column="status"/>
+        <result property="wagaName" column="waga_name"/>
+        <result property="wagaCode" column="waga_code"/>
         <result property="comment" column="comment"/>
         <result property="operator" column="operator" typeHandler="com.kms.yxgh.common.mapper.handler.OperatorHandler"/>
         <result property="doc" column="ts_doc" typeHandler="com.kms.yxgh.common.mapper.handler.DocHandler"/>
@@ -71,4 +73,69 @@
     </select>
 
 
+    <resultMap id="pageMap" type="com.kms.yxgh.sz.dto.v2.SzYhListV2Dto">
+        <id property="id" column="id"/>
+        <result property="checkingId" column="checking_id"/>
+        <result property="problemId" column="problem_id"/>
+        <result property="status" column="status"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="category" column="category"/>
+        <result property="wagaCode" column="waga_code"/>
+        <result property="wagaName" column="waga_name"/>
+        <result property="startDate" column="start_date"/>
+        <result property="problemLevel" column="problem_level"/>
+        <result property="dutyHolderName" column="duty_holder_name"/>
+        <result property="recordId" column="record_id"/>
+    </resultMap>
+    <select id="page" resultMap="pageMap">
+        select
+        yh.id ,
+        yh.checking_id ,
+        yh.problem_id ,
+        yh.status ,
+        yh.name ,
+        yh.type ,
+        yh.category ,
+        yh.waga_code ,
+        yh.waga_name ,
+        yh.start_date ,
+        yh.problem_level ,
+        yh.duty_holder_name ,
+        yh.record_id
+        from bs_sgc_sz_xcyj yh
+        left join att_waga_base base on base.waga_code=yh.waga_code
+        where 1=1
+        <if test="data.startDate != null">
+            and yh.start_date &gt;= #{data.startDate}
+        </if>
+        <if test="data.endDate != null">
+            and yh.end_date &lt;= #{data.endDate}
+        </if>
+        <if test="data.adcdQx != null and data.adcdQx != ''">
+            and base.adcd like concat(#{data.adcdQx}, '%')
+        </if>
+        <if test="data.category != null and data.category != ''">
+            and yh.category = #{data.category}
+        </if>
+        <if test="data.wagaCode != null and data.wagaCode != ''">
+            and yh.waga_code = #{data.wagaCode}
+        </if>
+        <if test="data.status != null and data.status != ''">
+            and yh.status = #{data.status}
+        </if>
+        <if test="data.type != null and data.type != ''">
+            and yh.type = #{data.type}
+        </if>
+        <if test="data.problemLevel != null and data.problemLevel != ''">
+            and yh.problem_level = #{data.problemLevel}
+        </if>
+        <if test="data.name != null and data.name != ''">
+            and yh.name like concat('%',#{data.name}, '%')
+        </if>
+        <if test="data.dutyHolder != null and data.dutyHolder != ''">
+            and yh.duty_holder_name like concat('%',#{data.dutyHolder}, '%')
+        </if>
+        order by yh.create_time desc
+    </select>
 </mapper>
\ No newline at end of file