wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 处理日志的"业务指定审批人"的信息

Browse Source
This commit is contained in:
wangli 2023-12-25 17:20:56 +08:00
parent d5880ec31b
commit 0fbb34db83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java
View File

@ -13,9 +13,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static cn.axzo.workflow.common.constant.BpmnConstants.DUMMY_ASSIGNEE_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT; import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT;
import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.DELETE_MI_EXECUTION;
import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.MI_END; import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.MI_END;
import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.REJECTION_AUTO_COMPLETED; import static cn.axzo.workflow.core.common.enums.BpmnProcessTaskResultEnum.REJECTION_AUTO_COMPLETED;
import static org.mapstruct.NullValueCheckStrategy.ALWAYS; import static org.mapstruct.NullValueCheckStrategy.ALWAYS;
@ -60,7 +58,9 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter<BpmnH
.filter(i -> (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) .filter(i -> (!Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason()))
|| (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason())) || (Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(REJECTION_AUTO_COMPLETED.getDesc(), i.getDeleteReason()))
).filter(i -> !(!Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(MI_END.getStatus(), i.getDeleteReason()))) ).filter(i -> !(!Objects.equals(i.getAssignee(), TASK_ASSIGNEE_SKIP_FLAT) && Objects.equals(MI_END.getStatus(), i.getDeleteReason())))
.filter(i -> !(Objects.equals(i.getAssignee(), DUMMY_ASSIGNEE_ID) && Objects.equals(DELETE_MI_EXECUTION.getStatus(), i.getDeleteReason()))) // FIXME 如果放开这里的过滤, 会导致任务列表中有多余的任务, 这个多余的任务是"业务指定审批人"的节点, 需要与产品确认后再处理
// .filter(i -> !(Objects.equals(i.getAssignee(), DUMMY_ASSIGNEE_ID) && Objects.equals
// (DELETE_MI_EXECUTION.getStatus(), i.getDeleteReason())))
.forEach(i -> vos.add(toVo(i))); .forEach(i -> vos.add(toVo(i)));
return vos; return vos;
} }