fix: 修改终审列表

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

@@ -496,7 +496,7 @@ public class FlowTaskController extends BaseController {
         Map<String, Object> query = searchQuery.getQuery();
 
 
-        flowTaskService.getFinalProcessInstances(query, pageUtils);
+        flowTaskService.getFinalProcessInstances(query, pageUtils,user);
         return ResultVoUtil.success(pageUtils);
     }
 

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

@@ -13,11 +13,8 @@ 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 cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.flowable.bpmn.model.UserTask;
@@ -102,9 +99,10 @@ public interface IFlowTaskService {
      *
      * @param query     搜索条件
      * @param pageUtils 分页参数
+     * @param user
      * @return
      */
-    public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils);
+    public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils, User user);
 
 
     /**

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

@@ -16,7 +16,6 @@ import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.oa.from.dataDao.FlowableccMybatisDao;
-import cn.jyjz.xiaoyao.oa.from.dataDao.IHisFlowableActinstDao;
 import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto;
 import cn.jyjz.flowable.factory.FlowServiceFactory;
 import cn.jyjz.flowable.service.IFlowTaskService;
@@ -36,7 +35,6 @@ import cn.jyjz.xiaoyao.oa.from.service.*;
 
 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.ocr.dataobject.*;
 import cn.jyjz.xiaoyao.ocr.service.*;
 import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
@@ -119,6 +117,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     private IOcrMsgService ocrMsgService;
     @Resource
     private UserdistionaryService userdistionaryService;
+
     @Override
     public void myTodoTaskList(PageUtils vo, HttpServletRequest request) {
 
@@ -512,6 +511,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
         }
     }
+
     /**
      * 完成任务
      */
@@ -784,6 +784,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
     /**
      * 获取候选用户或者审批组的用户信息集合
+     *
      * @param userTask  当前审批节点
      * @param loginname 流程发起人
      * @return
@@ -823,6 +824,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         return null;
     }
+
     /**
      * 设置当前审批节点的审批人
      * 目前只多候选组和多个候选人起作用
@@ -1172,9 +1174,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      *
      * @param query     搜索条件
      * @param pageUtils 分页参数
+     * @param user
      * @return
      */
-    public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils) {
+    public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils, User user) {
         ParamterPage paramterPage = new ParamterPage();
         paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize());
         paramterPage.setPagesize(pageUtils.getPageSize());
@@ -1282,7 +1285,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //                taskchildPicture.setTransferRecords(historicTaskInstanceDtos);
 //            }
 //        }
-
+        for (OcrTaskchildPicture ocrTaskchildPicture : list) {
+            String assignee = ocrTaskchildPicture.getAssignee();
+            if (assignee.contains(",")) {
+                String[] split = assignee.split(",");
+                for (int i = 0; i < split.length; i++) {
+                    if (user.getLoginname().equals(split[i])) {
+                        String[] taskIds = ocrTaskchildPicture.getTaskId().split(",");
+                        ocrTaskchildPicture.setTaskId(taskIds[i]);
+                    }
+                }
+            }
+        }
         pageUtils.setTotalCount(count.intValue());
         pageUtils.setList(list);
     }