From a08b260babb13c8253dd830a20dd18b6f632cdf8 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Tue, 25 Jun 2024 10:58:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java   | 11 +++++++++++
 .../java/com/kms/yxgh/df/service/DfRecordService.java |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
index 450275be..3cc2427c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSimpleDto.java
@@ -1,11 +1,13 @@
 package com.kms.yxgh.df.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.OperatorDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName: DfRecordSearchDto
@@ -24,6 +26,12 @@ public class DfRecordSimpleDto {
     @ApiModelProperty("巡查计划ID")
     private String planId;
 
+    @ApiModelProperty("计划类型")
+    private String planType;
+
+    @ApiModelProperty("巡查范围")
+    private String scope;
+
     @ApiModelProperty("堤防代码")
     private String dikeCode;
 
@@ -75,4 +83,7 @@ public class DfRecordSimpleDto {
     @ApiModelProperty("创建者名称")
     private String createName;
 
+    @ApiModelProperty("计划执行人")
+    List<OperatorDto> operators;
+
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
index 851384e9..ca65040f 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
@@ -16,6 +16,7 @@ import com.kms.yxgh.df.dto.DfRecordDetailExportDto;
 import com.kms.yxgh.df.dto.DfRecordSearchDto;
 import com.kms.yxgh.df.dto.DfRecordSimpleDto;
 import com.kms.yxgh.df.mapper.DfCheckingLineMapper;
+import com.kms.yxgh.df.mapper.DfPlanOperatorMapper;
 import com.kms.yxgh.df.mapper.DfRecordMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.kms.yxgh.util.StreamUtils;
@@ -47,6 +48,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
     private final DfRecordItemService recordItemService;
     private final DfCheckingLineMapper checkingLineMapper;
     private final SysUserService userService;
+    private final DfPlanOperatorMapper planOperatorMapper;
 
     public IPage<DfRecordSimpleDto> search(SearchParam<DfRecordSearchDto> sp) {
         IPage<DfRecord> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -63,10 +65,10 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         page = page(page, wp);
         if (CollectionUtil.isNotEmpty(page.getRecords())) {
             List<DfRecordSimpleDto> records = page.getRecords().stream().map(r -> {
-                DfRecordSimpleDto dto = BeanCopyUtils.copy(r, DfRecordSimpleDto
-                        .class);
+                DfRecordSimpleDto dto = BeanCopyUtils.copy(r, DfRecordSimpleDto.class);
                 if (dto != null) {
                     dto.setCreateName(userService.userName(dto.getCreateUid()));
+                    dto.setOperators(planOperatorMapper.selectOperatorBySubPlanId(r.getSubPlanId()));
                 }
                 return dto;
             }).collect(Collectors.toList());