fix: 添加巡检名称

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

@@ -30,6 +30,10 @@ public class DfProjectCheckingRelDto {
     public static class Checking {
         @ApiModelProperty(value = "巡查id")
         private String xcId;
+
+        @ApiModelProperty("名称")
+        private String name;
+
         @ApiModelProperty(value = "巡查类型")
         private String type;
     }

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yg.df.domain.BsSgcDfJbxx;
 import com.kms.yg.df.mapper.BsSgcDfJbxxMapper;
+import com.kms.yxgh.df.domain.DfChecking;
 import com.kms.yxgh.df.domain.DfProjectCheckingRel;
 import com.kms.yxgh.df.dto.*;
+import com.kms.yxgh.df.mapper.DfCheckingMapper;
 import com.kms.yxgh.df.mapper.DfProjectCheckingRelMapper;
 import com.shuili.common.core.domain.SearchParam;
 import lombok.AllArgsConstructor;
@@ -31,6 +33,7 @@ public class DfProjectService {
 
     private final BsSgcDfJbxxMapper dfProjectMapper;
     private final DfProjectCheckingRelMapper dfProjectCheckingRelMapper;
+    private final DfCheckingMapper dfCheckingMapper;
 
 
     public IPage<DfProjectListDto> getProjectList(SearchParam<BsSgcDfJbxx> sp) {
@@ -101,6 +104,7 @@ public class DfProjectService {
             DfProjectCheckingRelDto.Checking checking = new DfProjectCheckingRelDto.Checking();
             checking.setXcId(dfProjectCheckingRel.getXcId());
             checking.setType(dfProjectCheckingRel.getType());
+            checking.setName(Optional.ofNullable(dfCheckingMapper.selectById(dfProjectCheckingRel.getXcId())).map(DfChecking::getName).orElse(""));
             return checking;
         }).collect(Collectors.toList());
         dfProjectCheckingRelDto.setCheckings(checkings);

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

@@ -32,5 +32,7 @@ public class SzProjectCheckingRelDto {
         private String xcId;
         @ApiModelProperty(value = "巡查类型")
         private String type;
+        @ApiModelProperty("名称")
+        private String name;
     }
 }

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper;
+import com.kms.yxgh.sz.domain.SzChecking;
 import com.kms.yxgh.sz.domain.SzProjectCheckingRel;
 import com.kms.yxgh.sz.dto.*;
+import com.kms.yxgh.sz.mapper.SzCheckingMapper;
 import com.kms.yxgh.sz.mapper.SzProjectCheckingRelMapper;
 import com.shuili.common.core.domain.SearchParam;
 import lombok.AllArgsConstructor;
@@ -31,7 +33,7 @@ public class SzProjectService {
 
     private final BsSgcSzGcdaMapper bsSgcSzGcdaMapper;
     private final SzProjectCheckingRelMapper szProjectCheckingRelMapper;
-
+    private final SzCheckingMapper szCheckingMapper;
 
     public IPage<SzProjectListDto> getProjectList(SearchParam<BsSgcSzGcda> sp) {
         Page<SzProjectListDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -88,6 +90,7 @@ public class SzProjectService {
             SzProjectCheckingRelDto.Checking checking = new SzProjectCheckingRelDto.Checking();
             checking.setXcId(rel.getXcId());
             checking.setType(rel.getType());
+            checking.setName(Optional.ofNullable(szCheckingMapper.selectById(rel.getXcId())).map(SzChecking::getName).orElse(""));
             return checking;
         }).collect(Collectors.toList()));
         return relDto;