|
|
@ -1,10 +1,7 @@ |
|
|
|
package com.yxt.anrui.flowable.biz.flowtask; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.yxt.anrui.flowable.biz.process.ProcessService; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; |
|
|
|
import org.apache.commons.io.IOUtils; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.google.common.collect.Lists; |
|
|
@ -13,6 +10,7 @@ import com.yxt.anrui.flowable.api.flowtask.*; |
|
|
|
import com.yxt.anrui.flowable.api.sysform.SysForm; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; |
|
|
|
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; |
|
|
|
import com.yxt.anrui.flowable.biz.process.ProcessService; |
|
|
|
import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; |
|
|
|
import com.yxt.anrui.flowable.biz.sysprourl.SysProUrlService; |
|
|
|
import com.yxt.anrui.flowable.common.FlowComment; |
|
|
@ -26,6 +24,7 @@ import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; |
|
|
|
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUser; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserVo; |
|
|
|
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
@ -1125,10 +1124,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask |
|
|
|
parentUserTaskList.forEach(item -> { |
|
|
|
LatestTaskVo latestTaskVo = new LatestTaskVo(); |
|
|
|
latestTaskVo.setASSIGNEE_(item.getAssignee()); |
|
|
|
latestTaskVo.setId_(item.getId()); |
|
|
|
// latestTaskVo.setId_(item.getId());
|
|
|
|
Map<String, Object> map = flowTaskMapper.getHistTaskByID(task.getProcessInstanceId(), targetIds.get(0)); |
|
|
|
Map<String, Object> map2 = flowTaskMapper.getTaskByDefKey(task.getProcessInstanceId(), targetIds.get(0)); |
|
|
|
String id_ = map2.get("id_").toString(); |
|
|
|
latestTaskVo.setId_(id_); |
|
|
|
String assignee_ = map.get("ASSIGNEE_").toString(); |
|
|
|
taskService.setAssignee(id_, assignee_); |
|
|
|
latestTaskVo.setName_(item.getName()); |
|
|
|