fix：修复bug返回堤防水闸名称

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java

@@ -1,13 +1,12 @@
 package com.kms.yg.sz.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.system.service.SysXzqhService;
-import com.kms.yg.sz.domain.BsSgcSzBzbp;
-import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
-import com.kms.yg.sz.domain.dto.HistogramDto;
 import com.kms.yg.sz.domain.dto.PieDto;
 import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper;
 import com.shuili.common.core.domain.SearchParam;
@@ -116,4 +115,11 @@ public class BsSgcSzSafeJbxxService extends BaseService<BsSgcSzSafeJbxxMapper, B
         return map;
 
     }
+
+    public BsSgcSzSafeJbxx selectByWagaCode(String code) {
+        Wrapper<BsSgcSzSafeJbxx> queryWrapper = Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class)
+                .isNull(BsSgcSzSafeJbxx::getExprDate)
+                .eq(BsSgcSzSafeJbxx::getWagaCode, code);
+        return bsSgcSzSafeJbxxMapper.selectOne(queryWrapper);
+    }
 }

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java

@@ -28,6 +28,12 @@ public class DfYhPlanDetailDto {
   @ApiModelProperty("堤防代码")
   private String dikeCode;
 
+  /**
+   * 堤防名称
+   */
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
   /**
    * 名称
    */

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
+import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
 import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.df.domain.DfYhPlan;
 import com.kms.yxgh.df.dto.DfYhPlanDetailDto;
@@ -13,6 +15,7 @@ import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,10 +30,15 @@ import java.util.Optional;
 @Service
 public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> {
 
+    @Autowired
+    private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
 
     public DfYhPlanDetailDto getDetailById(String id) {
         DfYhPlan dfPlan = this.getById(id);
-        return BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class);
+        DfYhPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class);
+        BsSgcDfSafeJbxx dfInfo = bsSgcDfSafeJbxxService.selectByDikeCode(dfPlan.getDikeCode());
+        dto.setDikeName(dfInfo.getDikeName());
+        return dto;
     }
 
 

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java

@@ -28,6 +28,12 @@ public class SzYhPlanDetailDto {
   @ApiModelProperty("水闸代码")
   private String wagaCode;
 
+  /**
+   * 水闸名称
+   */
+    @ApiModelProperty("水闸名称")
+    private String wagaName;
+
   /**
    * 名称
    */

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhPlanService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
+import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.sz.domain.SzYhPlan;
 import com.kms.yxgh.sz.dto.SzYhPlanDetailDto;
@@ -13,6 +15,7 @@ import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
 import com.shuili.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,11 +27,15 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class SzYhPlanService extends BaseService<SzYhPlanMapper, SzYhPlan> {
-
+    @Autowired
+    private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
 
     public SzYhPlanDetailDto getDetailById(String id) {
         SzYhPlan szPlan = this.getById(id);
-        return BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
+        SzYhPlanDetailDto dto = BeanCopyUtils.copy(szPlan, SzYhPlanDetailDto.class);
+        BsSgcSzSafeJbxx szInfo = bsSgcSzSafeJbxxService.selectByWagaCode(dto.getWagaCode());
+        dto.setWagaName(szInfo.getWagaName());
+        return dto;
     }