|
|
@ -86,7 +86,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public AjaxResult complete(FlowTaskVo taskVo) {
|
|
|
|
public AjaxResult complete(FlowTaskVo taskVo) {
|
|
|
|
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
|
|
|
|
Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
|
|
|
|
if (Objects.isNull(task)){
|
|
|
|
if (Objects.isNull(task)) {
|
|
|
|
return AjaxResult.error("任务不存在");
|
|
|
|
return AjaxResult.error("任务不存在");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (DelegationState.PENDING.equals(task.getDelegationState())) {
|
|
|
|
if (DelegationState.PENDING.equals(task.getDelegationState())) {
|
|
|
@ -354,7 +354,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void deleteTask(FlowTaskVo flowTaskVo) {
|
|
|
|
public void deleteTask(FlowTaskVo flowTaskVo) {
|
|
|
|
// todo 待确认删除任务是物理删除任务 还是逻辑删除,让这个任务直接通过?
|
|
|
|
// todo 待确认删除任务是物理删除任务 还是逻辑删除,让这个任务直接通过?
|
|
|
|
taskService.deleteTask(flowTaskVo.getTaskId(),flowTaskVo.getComment());
|
|
|
|
taskService.deleteTask(flowTaskVo.getTaskId(), flowTaskVo.getComment());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -399,7 +399,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void assignTask(FlowTaskVo flowTaskVo) {
|
|
|
|
public void assignTask(FlowTaskVo flowTaskVo) {
|
|
|
|
taskService.setAssignee(flowTaskVo.getTaskId(),flowTaskVo.getComment());
|
|
|
|
taskService.setAssignee(flowTaskVo.getTaskId(), flowTaskVo.getComment());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -417,7 +417,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
.startedBy(userId.toString())
|
|
|
|
.startedBy(userId.toString())
|
|
|
|
.orderByProcessInstanceStartTime()
|
|
|
|
.orderByProcessInstanceStartTime()
|
|
|
|
.desc();
|
|
|
|
.desc();
|
|
|
|
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
page.setTotal(historicProcessInstanceQuery.count());
|
|
|
|
page.setTotal(historicProcessInstanceQuery.count());
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
for (HistoricProcessInstance hisIns : historicProcessInstances) {
|
|
|
|
for (HistoricProcessInstance hisIns : historicProcessInstances) {
|
|
|
@ -570,7 +570,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
// .taskAssignee(userId.toString())
|
|
|
|
// .taskAssignee(userId.toString())
|
|
|
|
.orderByTaskCreateTime().desc();
|
|
|
|
.orderByTaskCreateTime().desc();
|
|
|
|
page.setTotal(taskQuery.count());
|
|
|
|
page.setTotal(taskQuery.count());
|
|
|
|
List<Task> taskList = taskQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
|
|
for (Task task : taskList) {
|
|
|
|
for (Task task : taskList) {
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
@ -623,7 +623,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
.taskAssignee(userId.toString())
|
|
|
|
.taskAssignee(userId.toString())
|
|
|
|
.orderByHistoricTaskInstanceEndTime()
|
|
|
|
.orderByHistoricTaskInstanceEndTime()
|
|
|
|
.desc();
|
|
|
|
.desc();
|
|
|
|
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageNum - 1, pageSize);
|
|
|
|
List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
|
|
|
|
List<FlowTaskDto> hisTaskList = Lists.newArrayList();
|
|
|
|
List<FlowTaskDto> hisTaskList = Lists.newArrayList();
|
|
|
|
for (HistoricTaskInstance histTask : historicTaskInstanceList) {
|
|
|
|
for (HistoricTaskInstance histTask : historicTaskInstanceList) {
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
|
FlowTaskDto flowTask = new FlowTaskDto();
|
|
|
@ -657,7 +657,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
flowTask.setStartDeptName(startUser.getDept().getDeptName());
|
|
|
|
flowTask.setStartDeptName(startUser.getDept().getDeptName());
|
|
|
|
hisTaskList.add(flowTask);
|
|
|
|
hisTaskList.add(flowTask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
page.setTotal(hisTaskList.size());
|
|
|
|
page.setTotal(taskInstanceQuery.count());
|
|
|
|
page.setRecords(hisTaskList);
|
|
|
|
page.setRecords(hisTaskList);
|
|
|
|
// Map<String, Object> result = new HashMap<>();
|
|
|
|
// Map<String, Object> result = new HashMap<>();
|
|
|
|
// result.put("result",page);
|
|
|
|
// result.put("result",page);
|
|
|
@ -868,7 +868,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
|
|
|
|
List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
|
|
|
|
if (CollectionUtils.isNotEmpty(nextUserTask)) {
|
|
|
|
if (CollectionUtils.isNotEmpty(nextUserTask)) {
|
|
|
|
for (UserTask userTask : nextUserTask) {
|
|
|
|
for (UserTask userTask : nextUserTask) {
|
|
|
|
MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
|
|
|
|
MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
|
|
|
|
// 会签节点
|
|
|
|
// 会签节点
|
|
|
|
if (Objects.nonNull(multiInstance)) {
|
|
|
|
if (Objects.nonNull(multiInstance)) {
|
|
|
|
List<SysUser> list = sysUserService.selectUserList(new SysUser());
|
|
|
|
List<SysUser> list = sysUserService.selectUserList(new SysUser());
|
|
|
|