xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-30 15:16:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化作废，撤销等备注

Browse Source
This commit is contained in:
songgaoshuai 2023-08-11 10:31:00 +08:00
parent eb75a63dd7
commit 5e3cedb035
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
View File

@ -337,9 +337,9 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
if (CollUtil.isNotEmpty(subTasks)) { if (CollUtil.isNotEmpty(subTasks)) {
subTasks.forEach(e -> taskService.deleteTask(e.getId())); subTasks.forEach(e -> taskService.deleteTask(e.getId()));
} }
String deleteReason = LoginHelper.getUsername() + "作废了当前申请！"; String deleteReason = LoginHelper.getLoginUser().getNickname() + "作废了当前申请！";
if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) { if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) {
deleteReason = LoginHelper.getUsername() + "作废理由:" + processInvalidBo.getDeleteReason(); deleteReason = LoginHelper.getLoginUser().getNickname() + "作废理由:" + processInvalidBo.getDeleteReason();
} }
for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) { for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason); taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason);
@ -461,7 +461,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
List<Task> taskList = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId()).processInstanceId(processInstanceId).list(); List<Task> taskList = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId()).processInstanceId(processInstanceId).list();
for (Task task : taskList) { for (Task task : taskList) {
taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId())); taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId()));
taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getUsername() + "：撤销申请"); taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "：撤销申请");
} }
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0); HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0);
List<String> nodeIds = StreamUtils.toList(taskList, Task::getTaskDefinitionKey); List<String> nodeIds = StreamUtils.toList(taskList, Task::getTaskDefinitionKey);

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@ -356,7 +356,7 @@ public class ActTaskServiceImpl implements IActTaskService {
} }
try { try {
TaskEntity newTask = WorkflowUtils.createNewTask(task); TaskEntity newTask = WorkflowUtils.createNewTask(task);
taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.PENDING.getStatus(), "【" + LoginHelper.getUsername() + "】委派给【" + delegateBo.getNickName() + "】"); taskService.addComment(newTask.getId(), task.getProcessInstanceId(), TaskStatusEnum.PENDING.getStatus(), "【" + LoginHelper.getLoginUser().getNickname() + "】委派给【" + delegateBo.getNickName() + "】");
//委托任务 //委托任务
taskService.delegateTask(delegateBo.getTaskId(), delegateBo.getUserId()); taskService.delegateTask(delegateBo.getTaskId(), delegateBo.getUserId());
//办理生成的任务记录 //办理生成的任务记录
@ -392,9 +392,9 @@ public class ActTaskServiceImpl implements IActTaskService {
} }
try { try {
if (StringUtils.isBlank(terminationBo.getComment())) { if (StringUtils.isBlank(terminationBo.getComment())) {
terminationBo.setComment(LoginHelper.getUsername() + "终止了申请"); terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "终止了申请");
} else { } else {
terminationBo.setComment(LoginHelper.getUsername() + "终止了申请：" + terminationBo.getComment()); terminationBo.setComment(LoginHelper.getLoginUser().getNickname() + "终止了申请：" + terminationBo.getComment());
} }
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.TERMINATION.getStatus(), terminationBo.getComment()); taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.TERMINATION.getStatus(), terminationBo.getComment());
List<Task> list = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId()) List<Task> list = taskService.createTaskQuery().taskTenantId(TenantHelper.getTenantId())