Merge branch 'refs/heads/feature/countersign_ext' into dev
This commit is contained in:
commit
047c035d38
@ -38,6 +38,7 @@ import java.util.stream.Collectors;
|
|||||||
import static cn.axzo.workflow.common.code.OtherRespCode.ASSIGNEE_NODE_ID_NOT_EXISTS;
|
import static cn.axzo.workflow.common.code.OtherRespCode.ASSIGNEE_NODE_ID_NOT_EXISTS;
|
||||||
import static cn.axzo.workflow.common.constant.BpmnConstants.COUNTERSIGN_ASSIGNER_SHOW_NUMBER;
|
import static cn.axzo.workflow.common.constant.BpmnConstants.COUNTERSIGN_ASSIGNER_SHOW_NUMBER;
|
||||||
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT;
|
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT;
|
||||||
|
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_INFO;
|
||||||
import static cn.axzo.workflow.common.enums.BpmnCountersignTypeEnum.FORWARD_COUNTERSIGN;
|
import static cn.axzo.workflow.common.enums.BpmnCountersignTypeEnum.FORWARD_COUNTERSIGN;
|
||||||
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.COUNTERSIGN;
|
import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.COUNTERSIGN;
|
||||||
import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getCategoryVersion;
|
import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getCategoryVersion;
|
||||||
@ -170,7 +171,6 @@ public class CustomCountersignUserTaskCmd extends AbstractCommand<Void> implemen
|
|||||||
taskService.saveTask(taskEntity);
|
taskService.saveTask(taskEntity);
|
||||||
|
|
||||||
valuTargetAssigneeList.forEach(e -> {
|
valuTargetAssigneeList.forEach(e -> {
|
||||||
// TODO 创建新的任务
|
|
||||||
TaskEntityImpl subTask = (TaskEntityImpl) taskService.newTask(idGenerator.getNextId());
|
TaskEntityImpl subTask = (TaskEntityImpl) taskService.newTask(idGenerator.getNextId());
|
||||||
subTask.setName(task.getName());
|
subTask.setName(task.getName());
|
||||||
subTask.setDescription(task.getDescription());
|
subTask.setDescription(task.getDescription());
|
||||||
@ -183,8 +183,11 @@ public class CustomCountersignUserTaskCmd extends AbstractCommand<Void> implemen
|
|||||||
subTask.setPriority(task.getPriority());
|
subTask.setPriority(task.getPriority());
|
||||||
subTask.setCreateTime(new Date());
|
subTask.setCreateTime(new Date());
|
||||||
subTask.setTenantId(task.getTenantId());
|
subTask.setTenantId(task.getTenantId());
|
||||||
subTask.setAssignee(e.buildAssigneeId());
|
// subTask.setAssignee(e.buildAssigneeId());
|
||||||
taskService.saveTask(subTask);
|
taskService.saveTask(subTask);
|
||||||
|
// 设置快照信息
|
||||||
|
subTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + subTask.getId(), e.toJson());
|
||||||
|
taskService.setAssignee(subTask.getParentTaskId(), e.buildAssigneeId());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user