Commit b37a535d20870871de6928f508c886a4ea51da85
1 parent
0a259915
暂时回退流程推断的能力
Showing
2 changed files
with
4 additions
and
35 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
| 1 | 1 | package cn.iocoder.yudao.module.bpm.convert.task; |
| 2 | 2 | |
| 3 | -import cn.hutool.core.util.BooleanUtil; | |
| 4 | 3 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 5 | 4 | import cn.iocoder.yudao.framework.common.util.number.NumberUtils; |
| 6 | 5 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskDonePageItemRespVO; |
| 7 | 6 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; |
| 8 | 7 | import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskTodoPageItemRespVO; |
| 9 | 8 | import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; |
| 10 | -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; | |
| 11 | 9 | import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; |
| 12 | 10 | import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; |
| 13 | 11 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; |
| 14 | - | |
| 15 | 12 | import org.flowable.common.engine.impl.db.SuspensionState; |
| 16 | 13 | import org.flowable.engine.history.HistoricProcessInstance; |
| 17 | 14 | import org.flowable.engine.runtime.ProcessInstance; |
| ... | ... | @@ -21,7 +18,9 @@ import org.mapstruct.*; |
| 21 | 18 | import org.mapstruct.factory.Mappers; |
| 22 | 19 | import org.springframework.beans.BeanUtils; |
| 23 | 20 | |
| 24 | -import java.util.*; | |
| 21 | +import java.util.Collections; | |
| 22 | +import java.util.List; | |
| 23 | +import java.util.Map; | |
| 25 | 24 | import java.util.stream.Collectors; |
| 26 | 25 | |
| 27 | 26 | /** |
| ... | ... | @@ -149,7 +148,7 @@ public interface BpmTaskConvert { |
| 149 | 148 | AdminUserRespDTO startUser); |
| 150 | 149 | |
| 151 | 150 | default BpmTaskExtDO convert2TaskExt(Task task) { |
| 152 | - BpmTaskExtDO taskExtDO = new BpmTaskExtDO().setTaskId(task.getId()).setTaskDefKey(task.getTaskDefinitionKey()) | |
| 151 | + BpmTaskExtDO taskExtDO = new BpmTaskExtDO().setTaskId(task.getId()) | |
| 153 | 152 | .setAssigneeUserId(NumberUtils.parseLong(task.getAssignee())).setName(task.getName()) |
| 154 | 153 | .setProcessDefinitionId(task.getProcessDefinitionId()).setProcessInstanceId(task.getProcessInstanceId()); |
| 155 | 154 | taskExtDO.setCreateTime(task.getCreateTime()); |
| ... | ... | @@ -166,30 +165,4 @@ public interface BpmTaskConvert { |
| 166 | 165 | return reqDTO; |
| 167 | 166 | } |
| 168 | 167 | |
| 169 | - /** | |
| 170 | - * bpmTaskExtDo 类数据去重 | |
| 171 | - * | |
| 172 | - * @param bpmTaskExtDOList bpmTaskExtDo 类列表 | |
| 173 | - * | |
| 174 | - * @return 返回新的list | |
| 175 | - */ | |
| 176 | - default List<BpmTaskExtDO> distinct(List<BpmTaskExtDO> bpmTaskExtDOList) { | |
| 177 | - HashMap<String, BpmTaskExtDO> tmpMap = new HashMap<>(50); | |
| 178 | - List<BpmTaskExtDO> result = new ArrayList<>(); | |
| 179 | - for (BpmTaskExtDO bpmTaskExtDO : bpmTaskExtDOList) { | |
| 180 | - boolean containsResult = tmpMap.containsKey(bpmTaskExtDO.getTaskDefKey()); | |
| 181 | - if (BooleanUtil.isFalse(containsResult)) { | |
| 182 | - tmpMap.put(bpmTaskExtDO.getTaskDefKey(), bpmTaskExtDO); | |
| 183 | - } | |
| 184 | - BpmTaskExtDO tmpBpmTaskExtDO = tmpMap.get(bpmTaskExtDO.getTaskDefKey()); | |
| 185 | - if (bpmTaskExtDO.getTaskDefKey().equals(tmpBpmTaskExtDO.getTaskDefKey())) { | |
| 186 | - if (!bpmTaskExtDO.getResult().equals(BpmProcessInstanceResultEnum.PROCESS.getResult())) { | |
| 187 | - tmpMap.remove(bpmTaskExtDO.getTaskDefKey()); | |
| 188 | - tmpMap.put(bpmTaskExtDO.getTaskDefKey(), bpmTaskExtDO); | |
| 189 | - } | |
| 190 | - } | |
| 191 | - } | |
| 192 | - tmpMap.forEach((key, var) -> result.add(var)); | |
| 193 | - return result; | |
| 194 | - } | |
| 195 | 168 | } | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmTaskExtDO.java