fix: 修改任务审批

pull/117/head
sunchenliang 1 year ago
parent 43dd74c1b2
commit 78b2f03b6d

@ -8,6 +8,8 @@ import cn.jyjz.flowable.domain.vo.*;
import cn.jyjz.flowable.entity.FlowApprove; import cn.jyjz.flowable.entity.FlowApprove;
import cn.jyjz.flowable.entity.FlowTaskInfo; import cn.jyjz.flowable.entity.FlowTaskInfo;
import cn.jyjz.flowable.service.IFlowInstanceService; import cn.jyjz.flowable.service.IFlowInstanceService;
import cn.jyjz.xiaoyao.admin.dataobject.Department;
import cn.jyjz.xiaoyao.admin.service.DepartmentService;
import cn.jyjz.xiaoyao.common.base.language.SystemMessage; import cn.jyjz.xiaoyao.common.base.language.SystemMessage;
import cn.jyjz.xiaoyao.common.base.service.UserTokenService; import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
@ -103,7 +105,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
@Resource @Resource
private UserFinalService userFinalService; private UserFinalService userFinalService;
@Resource @Resource
private IRunFlowableActinstDao runFlowableActinstDao; private DepartmentService departmentService;
@Resource @Resource
private IHisFlowableActinstDao hisFlowableActinstDao; private IHisFlowableActinstDao hisFlowableActinstDao;
@ -482,9 +484,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//进入下一个节点 //进入下一个节点
taskService.complete(task.getId(), variables); taskService.complete(task.getId(), variables);
updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition,deptid); updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition,deptid);
String category = processDefinition.getCategory(); Department department = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, deptid));
Category categoryDto = this.categoryService.getCategory(category); IFormCustomService iFormCustomService = SpringUtils.getBean(department.getServicename());
IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
FlowModelVO formData = iFormCustomService.getForm(formId); FlowModelVO formData = iFormCustomService.getForm(formId);
List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid()); List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid());
Task taskData = null; Task taskData = null;

Loading…
Cancel
Save