BJ_FS / urbanops

Commit c00f8782d477e4580fe67b69a09ee9768d0b4d79

Authored by 颜惠青
2 parents 58ded23c 2de14c23

Merge branch 'dev'

Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/api/task/BpmTaskApiImpl.java
  View file @c00f878
... ... @@ -15,6 +15,7 @@ import org.springframework.util.StringUtils;
15 15 import org.springframework.validation.annotation.Validated;
16 16  
17 17 import java.util.*;
  18 +import java.util.stream.Collectors;
18 19 import java.util.stream.Stream;
19 20  
20 21 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
... ... @@ -69,8 +70,13 @@ public class BpmTaskApiImpl implements BpmTaskApi{
69 70 Set<Long> userIds = convertSetByFlatMap(taskList, task ->
70 71 Stream.of(NumberUtils.parseLong(task.getAssignee()), NumberUtils.parseLong(task.getOwner())));
71 72 Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
  73 +
  74 + // 过滤掉所有deleteReason = MI_END的任务，再进行遍历
  75 + List<HistoricTaskInstance> nonMIEndTaskList = taskList.stream()
  76 + .filter(task -> !"MI_END".equals(task.getDeleteReason()))
  77 + .collect(Collectors.toList());
72 78 // 5. 按任务结束时间倒序→创建时间倒序排序，确保取到最新任务
73   - HistoricTaskInstance lastTask = taskList.stream()
  79 + HistoricTaskInstance lastTask = nonMIEndTaskList.stream()
74 80 .reduce((first, last) -> last) // 遍历到最后一个元素
75 81 .orElse(null); // 空列表返回null
76 82 // 存储最后一个任务，后续封装VO
... ...