From d07c79edd1c4cdb53b662c3ab7d8d261b25d7749 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Mon, 26 Feb 2024 17:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yg/df/service/BsSgcDfDfrwService.java | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
index f83a3e52..ab74289f 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java
@@ -4,7 +4,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yg.df.domain.BsSgcDfDfrw;
+import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
+import com.kms.yg.df.domain.dto.DfrwDto;
 import com.kms.yg.df.mapper.BsSgcDfDfrwMapper;
+import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
 import com.kms.yg.sz.domain.dto.SzrwDto;
 import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
@@ -33,25 +36,25 @@ public class BsSgcDfDfrwService extends BaseService<BsSgcDfDfrwMapper, BsSgcDfDf
     private BsSgcSzSzrwMapper bsSgcSzSzrwMapper;
 
     @Autowired
-    private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper;
+    private BsSgcDfSafeJbxxMapper bsSgcSzSafeJbxxMapper;
 
     public IPage selectPage(SearchParam<BsSgcDfDfrw> sp) {
         Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
 
-        List<BsSgcSzSzrw> records = page.getRecords();
+        List<BsSgcDfDfrw> records = page.getRecords();
 
-        List<SzrwDto> list = new ArrayList<>();
-        for (BsSgcSzSzrw record : records) {
-            String wagaId = record.getWagaId();
-            BsSgcSzSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectById(wagaId);
+        List<DfrwDto> list = new ArrayList<>();
+        for (BsSgcDfDfrw record : records) {
+            String wagaId = record.getDikeId();
+            BsSgcDfSafeJbxx bsSgcSzSafeJbxx = bsSgcSzSafeJbxxMapper.selectById(wagaId);
             if (ObjectUtil.isNull(bsSgcSzSafeJbxx)) {
                 continue;
             }
 
-            SzrwDto szrwDto = new SzrwDto();
+            DfrwDto szrwDto = new DfrwDto();
             szrwDto.setId(record.getId());
-            szrwDto.setWagaName(bsSgcSzSafeJbxx.getWagaName());
-            szrwDto.setWagaType(bsSgcSzSafeJbxx.getWagaType());
+            szrwDto.setDikeName(bsSgcSzSafeJbxx.getDikeName());
+            szrwDto.setDikeType(bsSgcSzSafeJbxx.getDikeType());
             szrwDto.setAdcd(bsSgcSzSafeJbxx.getAdcd());
             szrwDto.setStatus(record.getStatus());
             szrwDto.setRemark(record.getRemark());