fix:修复子计划列表查询

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java

@@ -2,10 +2,7 @@ package com.kms.yxgh.df.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.base.Response;
-import com.kms.yxgh.df.dto.DfPlanDetailDto;
+import com.kms.yxgh.df.dto.*;
-import com.kms.yxgh.df.dto.DfPlanSearchDto;
-import com.kms.yxgh.df.dto.DfPlanSimpleDto;
-import com.kms.yxgh.df.dto.DfSubPlanSimpleDto;
 import com.kms.yxgh.df.service.DfPlanService;
 import com.shuili.common.annotation.Log;
 import com.shuili.common.core.domain.SearchParam;
@@ -39,9 +36,12 @@ public class DfPlanController {
         return dfPlanService.search(sp);
     }
 
+    /**
+     * 查询堤防巡视检查子计划列表
+     */
     @PostMapping("/sub/list")
     @ApiOperation("堤防巡视检查子计划列表")
-    public IPage<DfSubPlanSimpleDto> subList(@RequestBody SearchParam<DfPlanSearchDto> sp) {
+    public IPage<DfSubPlanSimpleDto> subList(@RequestBody SearchParam<DfSubPlanSearchDto> sp) {
         return dfPlanService.searchSub(sp);
     }
 

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

@@ -11,17 +11,17 @@ import java.util.List;
 @ApiModel(value = "堤防巡视检查计划查询")
 public class DfPlanSearchDto {
 
-    @ApiModelProperty(value = "计划名称")
-    private String planName;
-    @ApiModelProperty("巡查计划类型")
-    private String planType;
     @ApiModelProperty(value = "堤防编号")
     private String dikeCode;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "状态")
+    private String status;
     @ApiModelProperty(value = "记录状态")
     private String recordStatus;
     private String user;
-    @ApiModelProperty("路线类型")
+    @ApiModelProperty(value = "巡查人员id")
-    private String lineType;
+    private List<String> userIds;
     @ApiModelProperty(value = "开始时间")
     private Date startTime;
     @ApiModelProperty(value = "结束时间")

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

@@ -0,0 +1,28 @@
+package com.kms.yxgh.df.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "堤防巡视检查子计划查询")
+public class DfSubPlanSearchDto {
+
+    @ApiModelProperty(value = "计划名称")
+    private String planName;
+    @ApiModelProperty("巡查计划类型")
+    private String planType;
+    @ApiModelProperty(value = "堤防编号")
+    private String dikeCode;
+    @ApiModelProperty(value = "记录状态")
+    private String recordStatus;
+    private String user;
+    @ApiModelProperty("路线类型")
+    private String lineType;
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+}

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.df.domain.DfPlan;
 import com.kms.yxgh.df.dto.DfPlanSearchDto;
 import com.kms.yxgh.df.dto.DfPlanSimpleDto;
+import com.kms.yxgh.df.dto.DfSubPlanSearchDto;
 import com.kms.yxgh.df.dto.DfSubPlanSimpleDto;
 import com.shuili.common.utils.StringUtils;
 import org.apache.ibatis.annotations.*;
@@ -110,7 +111,7 @@ public interface DfPlanMapper extends BaseMapper<DfPlan> {
             @Result(property = "recordId", column = "record_id"),
             @Result(property = "operator", column = "sub_plan_id", javaType = List.class, many = @Many(select = "com.kms.yxgh.df.mapper.DfPlanOperatorMapper.selectOperatorBySubPlanId"))
     })
-    IPage<DfSubPlanSimpleDto> subSearch(Page<DfPlan> page, @Param("searchDto") DfPlanSearchDto searchDto);
+    IPage<DfSubPlanSimpleDto> subSearch(Page<DfPlan> page, @Param("searchDto") DfSubPlanSearchDto searchDto);
 
     class DfPlanSqlProvider {
         public String selectByDikeCode(final Map<String, Object> param) {

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

@@ -61,9 +61,9 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
         return result;
     }
 
-    public IPage<DfSubPlanSimpleDto> searchSub(SearchParam<DfPlanSearchDto> sp) {
+    public IPage<DfSubPlanSimpleDto> searchSub(SearchParam<DfSubPlanSearchDto> sp) {
         Page<DfPlan> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        DfPlanSearchDto searchDto = sp.getData();
+        DfSubPlanSearchDto searchDto = sp.getData();
         SysUser user = UserUtils.getUser();
         searchDto.setUser(Optional.ofNullable(user).map(SysUser::getId).orElse(null));
         return this.getBaseMapper().subSearch(page, searchDto);