fix: 任务重复列表修改

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -22,6 +22,7 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
@@ -29,9 +30,11 @@ import cn.jyjz.xiaoyao.ocr.service.OcrSearchmanagerService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
 import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.alanpoi.common.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.http.MediaType;
@@ -675,6 +678,7 @@ public class FlowTaskController extends BaseController {
     @ResponseBody
     public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
                                        @RequestParam(name = "pageSize") Integer pageSize) {
-        return flowTaskService.repetitionTaskList(pageNo, pageSize);
+        IPage<RepeatedTaskVo> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
+        return ResultVoUtil.success(result);
     }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java

@@ -13,9 +13,12 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.task.api.Task;
 
@@ -175,5 +178,5 @@ public interface IFlowTaskService {
      */
     ResultVo repetitionTask();
 
-    ResultVo repetitionTaskList(Integer pageNo, Integer pageSize);
+    IPage<RepeatedTaskVo> repetitionTaskList(Integer pageNo, Integer pageSize);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -33,6 +33,7 @@ import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc;
 import cn.jyjz.xiaoyao.oa.from.service.*;
 
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
@@ -1814,10 +1815,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     }
 
     @Override
-    public ResultVo repetitionTaskList(Integer pageNo, Integer pageSize) {
-        Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
+    public IPage<RepeatedTaskVo> repetitionTaskList(Integer pageNo, Integer pageSize) {
+        Page<RepeatedTaskVo> page = new Page<>(pageNo, pageSize);
 
-        return ResultVoUtil.success(flowableccMybatisDao.repetitionTaskList(page));
+        return flowableccMybatisDao.repetitionTaskList(page);
     }
 
     /**

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java

@@ -42,5 +42,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
 
     List<RepeatedContentVo> repetitionTask();
 
-    Page<RepeatedTaskVo> repetitionTaskList(Page<OcrTaskChildPictureVo> page);
+    Page<RepeatedTaskVo> repetitionTaskList(Page<RepeatedTaskVo> page);
 }