hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

流程详情页 60% - 审批记录

Browse Source
This commit is contained in:
YunaiV
2022-01-16 23:36:47 +08:00
parent f0963c3941
commit 5022ed2533
2 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmTaskServiceImpl.java
View File

@ -95,7 +95,8 @@ public class BpmTaskServiceImpl implements BpmTaskService {
// 获得任务列表
List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInstanceId)
.orderByTaskCreateTime().desc().list();
.orderByHistoricTaskInstanceStartTime().desc() // 创建时间倒序
.list();
if (CollUtil.isEmpty(tasks)) {
return Collections.emptyList();
}
@ -401,7 +402,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
@Override
public void updateTaskExtComplete(org.activiti.api.task.model.Task task) {
BpmTaskExtDO taskExtDO = BpmTaskConvert.INSTANCE.convert(task)
.setEndTime(task.getCompletedDate())
.setEndTime(new Date()) // 此时不能使用 task 的 completeData，因为还是空的。
.setResult(BpmProcessInstanceResultEnum.APPROVE.getResult());
taskExtMapper.updateByTaskId(taskExtDO);
}