feat: 添加维修养护计划审批列表

shuili-system/src/main/java/com/kms/yxgh/common/controller/ApprovalAbstractController.java

@@ -1,12 +1,14 @@
 package com.kms.yxgh.common.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kms.common.utils.UserUtils;
 import com.kms.yxgh.common.ApprovalTypeEnum;
 import com.kms.yxgh.common.dto.ApprovalDetailDto;
 import com.kms.yxgh.common.dto.ApprovalSearchDto;
 import com.kms.yxgh.common.service.ApprovalBusinessService;
 import com.kms.yxgh.common.service.ApprovalService;
 import com.shuili.common.core.domain.SearchParam;
+import com.shuili.common.core.domain.entity.SysUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -29,6 +31,14 @@ public abstract class ApprovalAbstractController<S, T> {
         if (service == null) {
             return null;
         } else {
+            SysUser user = UserUtils.getUser();
+            if (user == null) {
+                throw new RuntimeException("用户未登录");
+            }
+            if (sp.getData() == null) {
+                sp.setData(new ApprovalSearchDto<>());
+            }
+            sp.getData().setUserId(user.getId());
             sp.getData().setBusinessType(getApprovalType().getValue());
             return service.approvalSearch(sp);
         }

shuili-system/src/main/java/com/kms/yxgh/common/domain/ApprovalOperator.java

@@ -2,6 +2,7 @@ package com.kms.yxgh.common.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kms.yxgh.base.SyBaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +10,7 @@ import lombok.Data;
 @TableName("bs_sgc_dp_operator")
 @Data
 @ApiModel("审批执行人")
-public class ApprovalOperator {
+public class ApprovalOperator extends SyBaseEntity {
 
     @ApiModelProperty("用户ID")
     private String uid;
@@ -18,5 +19,5 @@ public class ApprovalOperator {
     private String name;
 
     @ApiModelProperty("审批任务ID")
-    private int taskId;
+    private String taskId;
 }

shuili-system/src/main/java/com/kms/yxgh/common/domain/ApprovalTask.java

@@ -6,19 +6,21 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @TableName("bs_sgc_sp_task")
 @Data
 @ApiModel("审批任务")
 public class ApprovalTask extends SyBaseEntity {
 
     @ApiModelProperty("表单ID")
-    private int formId;
+    private String formId;
 
     @ApiModelProperty("业务类型")
     private String businessType;
 
     @ApiModelProperty("状态")
-    private int status;
+    private String status;
 
     @ApiModelProperty("审批人")
     private String operator;
@@ -28,4 +30,7 @@ public class ApprovalTask extends SyBaseEntity {
 
     @ApiModelProperty("审批文档")
     private String doc;
+
+    @ApiModelProperty("审批时间")
+    private Date approvalTime;
 }

shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalDetailDto.java

@@ -3,13 +3,24 @@ package com.kms.yxgh.common.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 @ApiModel("审批详情")
 @Data
-public abstract class ApprovalDetailDto<T> {
+@AllArgsConstructor
+@NoArgsConstructor
+public class ApprovalDetailDto<T> {
+
+    @ApiModelProperty("审批id")
+    private String id;
+
+    @ApiModelProperty("表单id")
+    private String formId;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("提交时间")
@@ -23,14 +34,15 @@ public abstract class ApprovalDetailDto<T> {
     private String status;
 
     @ApiModelProperty("审批人")
-    private String approver;
+    private OperatorDto approver;
 
     @ApiModelProperty("审批意见")
     private String comment;
 
     @ApiModelProperty("审批材料")
-    private DocDto doc;
+    private List<DocDto> doc;
 
     @ApiModelProperty("审批详情")
     private T detail;
+
 }

shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java

@@ -7,7 +7,7 @@ import lombok.Data;
 
 @ApiModel("审批搜索")
 @Data
-public abstract class ApprovalSearchDto<T> {
+public class ApprovalSearchDto<T> {
 
     @ApiModelProperty("审批状态")
     private String status;
@@ -15,6 +15,9 @@ public abstract class ApprovalSearchDto<T> {
     @JsonIgnore
     private String businessType;
 
+    @JsonIgnore
+    private String userId;
+
     @ApiModelProperty("业务条件")
     private T condition;
 }

shuili-system/src/main/java/com/kms/yxgh/common/mapper/handler/ListDocHandler.java

@@ -0,0 +1,6 @@
+package com.kms.yxgh.common.mapper.handler;
+
+import com.kms.yxgh.common.dto.DocDto;
+
+public class ListDocHandler extends ListHandler<DocDto> {
+}

shuili-system/src/main/java/com/kms/yxgh/common/mapper/handler/ListHandler.java

@@ -0,0 +1,49 @@
+package com.kms.yxgh.common.mapper.handler;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.lang.reflect.ParameterizedType;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+
+public class ListHandler<T> extends BaseTypeHandler<List<T>> {
+
+    @Override
+    public void setNonNullParameter(PreparedStatement preparedStatement, int i, List<T> docDtos, JdbcType jdbcType) throws SQLException {
+        preparedStatement.setString(i, JSON.toJSONString(docDtos));
+    }
+
+    @Override
+    public List<T> getNullableResult(ResultSet resultSet, String s) throws SQLException {
+        if (resultSet.getString(s) != null) {
+            return JSON.parseArray(resultSet.getString(s), getTClass());
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<T> getNullableResult(ResultSet resultSet, int i) throws SQLException {
+        if (resultSet.getString(i) != null) {
+            return JSON.parseArray(resultSet.getString(i), getTClass());
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<T> getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
+        if (callableStatement.getString(i) != null) {
+            return JSON.parseArray(callableStatement.getString(i), getTClass());
+        }
+        return Collections.emptyList();
+    }
+
+    private Class<T> getTClass() {
+        return (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+    }
+}

shuili-system/src/main/java/com/kms/yxgh/common/mapper/handler/ListOperatorHandler.java

@@ -0,0 +1,6 @@
+package com.kms.yxgh.common.mapper.handler;
+
+import com.kms.yxgh.common.dto.OperatorDto;
+
+public class ListOperatorHandler extends ListHandler<OperatorDto> {
+}

shuili-system/src/main/java/com/kms/yxgh/common/mapper/handler/ListSupplementHandler.java

@@ -0,0 +1,6 @@
+package com.kms.yxgh.common.mapper.handler;
+
+import com.kms.yxgh.common.dto.SupplementDto;
+
+public class ListSupplementHandler extends ListHandler<SupplementDto> {
+}

shuili-system/src/main/java/com/kms/yxgh/common/mapper/handler/OperatorHandler.java

@@ -0,0 +1,41 @@
+package com.kms.yxgh.common.mapper.handler;
+
+import com.alibaba.fastjson.JSON;
+import com.kms.yxgh.common.dto.OperatorDto;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class OperatorHandler extends BaseTypeHandler<OperatorDto> {
+    public OperatorHandler() {
+    }
+
+    public void setNonNullParameter(PreparedStatement ps, int i, OperatorDto parameter, JdbcType jdbcType) throws SQLException {
+        ps.setString(i, JSON.toJSONString(parameter));
+    }
+
+    public OperatorDto getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        if (rs.getString(columnName) != null) {
+            return JSON.parseObject(rs.getString(columnName), OperatorDto.class);
+        }
+        return null;
+    }
+
+    public OperatorDto getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        if (rs.getString(columnIndex) != null) {
+            return JSON.parseObject(rs.getString(columnIndex), OperatorDto.class);
+        }
+        return null;
+    }
+
+    public OperatorDto getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        if (cs.getString(columnIndex) != null) {
+            return JSON.parseObject(cs.getString(columnIndex), OperatorDto.class);
+        }
+        return null;
+    }
+}

shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalOperatorService.java

@@ -0,0 +1,12 @@
+package com.kms.yxgh.common.service;
+
+import com.kms.yxgh.common.domain.ApprovalOperator;
+import com.kms.yxgh.common.mapper.ApprovalOperatorMapper;
+import com.shuili.common.core.service.BaseService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ApprovalOperatorService extends BaseService<ApprovalOperatorMapper, ApprovalOperator> {
+}

shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java

@@ -1,38 +1,102 @@
 package com.kms.yxgh.common.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
+import com.kms.common.utils.UserUtils;
 import com.kms.yxgh.common.ApprovalStatusEnum;
 import com.kms.yxgh.common.ApprovalTypeEnum;
+import com.kms.yxgh.common.domain.ApprovalOperator;
+import com.kms.yxgh.common.domain.ApprovalTask;
 import com.kms.yxgh.common.dto.ApprovalDetailDto;
-import com.kms.yxgh.common.mapper.ApprovalOperatorMapper;
-import com.kms.yxgh.common.mapper.ApprovalTaskMapper;
+import com.kms.yxgh.common.dto.OperatorDto;
+import com.shuili.common.core.domain.entity.SysUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class ApprovalService {
 
-    private final ApprovalTaskMapper approvalTaskMapper;
-    private final ApprovalOperatorMapper approvalOperatorMapper;
+    private final ApprovalTaskService approvalTaskService;
+    private final ApprovalOperatorService approvalOperatorService;
 
 
     @Transactional(rollbackFor = Exception.class)
     public void submit(String formId, ApprovalTypeEnum approvalType) {
         ApprovalBusinessService service = approvalType.getService();
-
         if (service != null) {
+            ApprovalTask approvalTask = new ApprovalTask();
+            approvalTask.setFormId(formId);
+            approvalTask.setBusinessType(approvalType.getValue());
+            approvalTask.setStatus(ApprovalStatusEnum.WAITING.getValue());
+            approvalTaskService.save(approvalTask);
+            String taskId = approvalTask.getId();
+            List<OperatorDto> operatorDtoList = service.getOperatorList(formId);
+            if (CollectionUtil.isNotEmpty(operatorDtoList)) {
+                List<ApprovalOperator> approvalOperators = operatorDtoList.stream().map(operatorDto -> {
+                    ApprovalOperator approvalOperator = new ApprovalOperator();
+                    approvalOperator.setUid(operatorDto.getUid());
+                    approvalOperator.setName(operatorDto.getName());
+                    approvalOperator.setTaskId(taskId);
+                    return approvalOperator;
+                }).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(approvalOperators)) {
+                    approvalOperatorService.saveBatch(approvalOperators);
+                }
+            }
+
             service.updateApprovalStatus(formId, ApprovalStatusEnum.WAITING);
         }
     }
 
     @Transactional(rollbackFor = Exception.class)
     public <T> void rejected(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto<T> dto) {
+        ApprovalTask approvalTask = approvalTaskService.getById(id);
+        if (approvalTask != null) {
+            approvalTask.setStatus(ApprovalStatusEnum.REJECT.getValue());
+            approvalTask.setComment(dto.getComment());
+            approvalTask.setDoc(JSON.toJSONString(dto.getDoc()));
+            approvalTask.setOperator(getOperatorDto());
+            approvalTask.setApprovalTime(new Date());
+            approvalTaskService.updateById(approvalTask);
+            ApprovalBusinessService service = approvalType.getService();
+            if (service != null) {
+                service.updateApprovalStatus(approvalTask.getFormId(), ApprovalStatusEnum.REJECT);
+            }
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)
     public <T> void passed(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto<T> dto) {
+        ApprovalTask approvalTask = approvalTaskService.getById(id);
+        if (approvalTask != null) {
+            approvalTask.setStatus(ApprovalStatusEnum.PASS.getValue());
+            approvalTask.setComment(dto.getComment());
+            approvalTask.setDoc(JSON.toJSONString(dto.getDoc()));
+            approvalTask.setOperator(getOperatorDto());
+            approvalTask.setApprovalTime(new Date());
+            approvalTaskService.updateById(approvalTask);
+            ApprovalBusinessService service = approvalType.getService();
+            if (service != null) {
+                service.updateApprovalStatus(approvalTask.getFormId(), ApprovalStatusEnum.PASS);
+            }
+        }
     }
 
+    private String getOperatorDto() {
+        SysUser user = UserUtils.getUser();
+        if (user == null) {
+            throw new RuntimeException("用户未登录");
+        }
+        OperatorDto operatorDto = new OperatorDto();
+        operatorDto.setUid(user.getId());
+        operatorDto.setName(user.getUserName());
+        return JSON.toJSONString(operatorDto);
+    }
 
 }

shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalTaskService.java

@@ -0,0 +1,12 @@
+package com.kms.yxgh.common.service;
+
+import com.kms.yxgh.common.domain.ApprovalTask;
+import com.kms.yxgh.common.mapper.ApprovalTaskMapper;
+import com.shuili.common.core.service.BaseService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ApprovalTaskService extends BaseService<ApprovalTaskMapper, ApprovalTask> {
+}

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

@@ -56,7 +56,7 @@ public class DfYhPlanDetailDto {
     private List<SupplementDto> supplements;
 
     @ApiModelProperty("文档")
-    private DocDto doc;
+    private List<DocDto> doc;
 
     @ApiModelProperty("工程单位")
     private String engineeringUnit;
@@ -74,5 +74,4 @@ public class DfYhPlanDetailDto {
     @ApiModelProperty("状态")
     private String status;
 
-
 }

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

@@ -1,6 +1,7 @@
 package com.kms.yxgh.df.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -3,10 +3,17 @@ package com.kms.yxgh.df.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kms.yxgh.common.dto.ApprovalDetailDto;
+import com.kms.yxgh.common.dto.ApprovalSearchDto;
+import com.kms.yxgh.common.mapper.handler.ListDocHandler;
+import com.kms.yxgh.common.mapper.handler.ListSupplementHandler;
+import com.kms.yxgh.common.mapper.handler.OperatorHandler;
 import com.kms.yxgh.df.domain.DfYhPlan;
 import com.kms.yxgh.df.dto.DfYhPlanDetailDto;
 import com.kms.yxgh.df.dto.DfYhPlanSearchDto;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
@@ -21,7 +28,10 @@ public interface DfYhPlanMapper extends BaseMapper<DfYhPlan> {
 
     @Select({
             "<script>",
-            "SELECT yh.id, yh.dike_code, yh.name, yh.plan_time, yh.national_supplement, yh.self_supplement, yh.location, yh.content, yh.create_time, yh.update_time, jb.dike_grad, jb.dike_name,jb.id as dike_id ",
+            "SELECT yh.id, yh.dike_code, yh.dike_name, yh.dike_type, ",
+            "yh.name, yh.type, yh.start_date, yh.end_date, yh.supplement, yh.doc, ",
+            "yh.engineering_unit, yh.responsible_person, yh.reminder_time, yh.remark, yh.status, ",
+            " yh.create_time, yh.update_time ",
             "FROM bs_sgc_df_yhjh yh ",
             "LEFT JOIN att_dike_base jb ON yh.dike_code = jb.dike_code and jb.expr_date is null ",
             "WHERE jb.expr_date is null ",
@@ -31,11 +41,78 @@ public interface DfYhPlanMapper extends BaseMapper<DfYhPlan> {
             "<if test='dto.name != null'>",
             "AND yh.name LIKE CONCAT('%',#{dto.name},'%') ",
             "</if>",
-            "<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>",
-            "AND jb.dike_grad = #{dto.dikeGrad} ",
+            "<if test='dto.adcd != null and dto.adcd != \"\"'>",
+            "AND jb.adcd LIKE CONCAT(#{dto.adcd},'%') ",
             "</if>",
+            "<if test='dto.dikeName != null and dto.dikeName != \"\"'>",
+            "AND yh.dike_name LIKE CONCAT('%',#{dto.dikeName},'%') ",
+            "</if>",
+            "<if test='dto.startDate != null'>",
+            "AND yh.start_date &gt;= #{dto.startDate} ",
+            "</if>",
+            "<if test='dto.endDate != null'>",
+            "AND yh.end_date &lt;= #{dto.endDate} ",
+            "</if>",
+            "ORDER BY yh.create_time DESC",
             "</script>"
     })
     IPage<DfYhPlanDetailDto> selectPage(Page<DfYhPlanSearchDto> page, @Param("dto") DfYhPlanSearchDto dto);
 
+
+    @Select({"<script>",
+            "SELECT ts.id id, ts.form_id formId, ts.create_time submitTime, ts.approval_time approval_time, ts.status status, ",
+            "ts.approver approver, ts.comment comment, ts.doc ts_doc, ",
+            "yh.di_code dike_code, yh.dike_name dike_name, yh.name plan_name, yh.start_date start_date, yh.end_date end_date, ",
+            "yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person responsible_person, ",
+            "yh.type type ",
+            "FROM bs_sgc_sp_task ts ",
+            "LEFT JOIN bs_sgc_dp_operator op ON ts.id = op.task_id and op.uid = #{dto.userId} ",
+            "LEFT JOIN bs_sgc_df_yhjh yh ON yh.id = ts.form_id ",
+            "LEFT JOIN att_dike_base jb ON yh.dike_code = jb.dike_code and jb.expr_date is null ",
+            "",
+            "WHERE ts.business_type = #{dto.businessType} ",
+            "<if test='dto.status != null'>",
+            "AND ts.status = #{dto.status} ",
+            "</if>",
+            "<if test='dto.condition.dikeCode != null and dto.condition.dikeCode != \"\"'>",
+            "AND yh.dike_code = #{dto.condition.dikeCode} ",
+            "</if>",
+            "<if test='dto.condition.name != null'>",
+            "AND yh.name LIKE CONCAT('%',#{dto.condition.name},'%') ",
+            "</if>",
+            "<if test='dto.condition.adcd != null and dto.condition.adcd != \"\"'>",
+            "AND jb.adcd LIKE CONCAT(#{dto.condition.adcd},'%') ",
+            "</if>",
+            "<if test='dto.condition.dikeName != null and dto.condition.dikeName != \"\"'>",
+            "AND yh.dike_name LIKE CONCAT('%',#{dto.condition.dikeName},'%') ",
+            "</if>",
+            "<if test='dto.condition.startDate != null'>",
+            "AND yh.start_date &gt;= #{dto.condition.startDate} ",
+            "</if>",
+            "<if test='dto.condition.endDate != null'>",
+            "AND yh.end_date &lt;= #{dto.condition.endDate} ",
+            "</if>",
+            "ORDER BY yh.create_time DESC",
+            "</script>"
+    })
+    @Results({
+            @Result(property = "detail.dikeCode", column = "dike_code"),
+            @Result(property = "detail.dikeName", column = "dike_name"),
+            @Result(property = "detail.name", column = "plan_name"),
+            @Result(property = "detail.startDate", column = "start_date"),
+            @Result(property = "detail.endDate", column = "end_date"),
+            @Result(property = "detail.supplements", column = "supplement", typeHandler = ListSupplementHandler.class),
+            @Result(property = "detail.doc", column = "doc", typeHandler = ListDocHandler.class),
+            @Result(property = "detail.engineeringUnit", column = "engineering_unit"),
+            @Result(property = "detail.responsiblePerson", column = "responsible_person", typeHandler = OperatorHandler.class),
+            @Result(property = "detail.type", column = "type"),
+            @Result(property = "detail.id", column = "form_id"),
+            @Result(property = "detail.startDate", column = "startDate"),
+            @Result(property = "detail.endDate", column = "endDate"),
+            @Result(property = "detail.dikeType", column = "dike_type"),
+            @Result(property = "doc", column = "ts_doc", typeHandler = ListDocHandler.class),
+            @Result(property = "approver", column = "approver", typeHandler = OperatorHandler.class)
+    })
+    IPage<ApprovalDetailDto<DfYhPlanDetailDto>> approvalSearchPage(Page<DfYhPlanSearchDto> page, @Param("dto") ApprovalSearchDto<DfYhPlanSearchDto> dto);
+
 }

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

@@ -42,7 +42,7 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
         DfYhPlan dfPlan = this.getById(id);
         DfYhPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfYhPlanDetailDto.class);
         if (dto != null) {
-            dto.setDoc(JSON.parseObject(dfPlan.getDoc(), DocDto.class));
+            dto.setDoc(JSON.parseArray(dfPlan.getDoc(), DocDto.class));
             dto.setSupplements(JSON.parseArray(dfPlan.getSupplement(), SupplementDto.class));
             dto.setResponsiblePerson(JSON.parseObject(dfPlan.getResponsiblePerson(), OperatorDto.class));
         }
@@ -118,7 +118,8 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
 
     @Override
     public IPage<ApprovalDetailDto<DfYhPlanDetailDto>> approvalSearch(SearchParam<ApprovalSearchDto<DfYhPlanSearchDto>> sp) {
-        return null;
+        Page<DfYhPlanSearchDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
+        return this.getBaseMapper().approvalSearchPage(page, sp.getData());
     }
 
     @Override