fix: 任务重复列表修改

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

@@ -678,7 +678,7 @@ public class FlowTaskController extends BaseController {
     @ResponseBody
     public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
                                        @RequestParam(name = "pageSize") Integer pageSize) {
-        IPage<RepeatedTaskVo> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
+        IPage<OcrTaskchildPicture> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
         return ResultVoUtil.success(result);
     }
 }

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

@@ -178,5 +178,5 @@ public interface IFlowTaskService {
      */
     ResultVo repetitionTask();
 
-    IPage<RepeatedTaskVo> repetitionTaskList(Integer pageNo, Integer pageSize);
+    IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize);
 }

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

@@ -1815,10 +1815,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     }
 
     @Override
-    public IPage<RepeatedTaskVo> repetitionTaskList(Integer pageNo, Integer pageSize) {
+    public IPage<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize) {
-        Page<RepeatedTaskVo> page = new Page<>(pageNo, pageSize);
+        Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
-
+        List<OcrTaskchildPicture> result = flowableccMybatisDao.repetitionTaskList();
-        return flowableccMybatisDao.repetitionTaskList(page);
+        List<OcrTaskchildPicture> collect = result.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        page.setRecords(collect);
+        page.setTotal(collect.size());
+        return page;
     }
 
     /**

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

@@ -5,6 +5,7 @@ import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
 import cn.jyjz.xiaoyao.oa.from.vo.RepeatedContentVo;
 import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.oa.from.vo.UserDistionaryVo;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,5 +43,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
 
     List<RepeatedContentVo> repetitionTask();
 
-    Page<RepeatedTaskVo> repetitionTaskList(Page<RepeatedTaskVo> page);
+    List<OcrTaskchildPicture> repetitionTaskList();
 }

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml

@@ -223,20 +223,20 @@
                  LEFT JOIN ocr_picture t3 on t1.content = t3.field8
     </select>
 
-	<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo">
+	<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture">
-		SELECT
+		SELECT t2.*
-			t1.content,
+<!--			t1.content,-->
-			t1.id,
+<!--			t1.id,-->
-			t1.imgUrl,
+<!--			t1.imgUrl,-->
-			t3.similarity_score similarityScore,
+<!--			t3.similarity_score similarityScore,-->
-			t2.STATES,
+<!--			t2.STATES,-->
-			t3.remark           fromTaskId,
+<!--			t3.remark           fromTaskId,-->
-			t3.taskName,
+<!--			t3.taskName,-->
-			t2.TASKNAME         nodeName,
+<!--			t2.TASKNAME         nodeName,-->
-			t2.FROMUPTIME       fromTime,
+<!--			t2.FROMUPTIME       fromTime,-->
-			t2.UPDATETIME       updateTime,
+<!--			t2.UPDATETIME       updateTime,-->
-			t2.TASKID			taskId,
+<!--			t2.TASKID			taskId,-->
-			t2.ID formId
+<!--			t2.ID formId-->
 		from (select field8 content, ID id, imgUrl
 			  FROM ocr_picture
 			  where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)