Commit 7b37439c by 王志超

feat: 导出变更工单

parent afe3f1a6
Pipeline #86882 passed with stages
in 1 minute 32 seconds
...@@ -2076,15 +2076,28 @@ public class ChangeFlowBiz { ...@@ -2076,15 +2076,28 @@ public class ChangeFlowBiz {
*/ */
private void buildChangeEndTime(ChangeRecord changeRecord, ChangeFlowVO changeFlowVO, Map<Long, List<ChangeSubFlowRecord>> subFlowRecordsMap) { private void buildChangeEndTime(ChangeRecord changeRecord, ChangeFlowVO changeFlowVO, Map<Long, List<ChangeSubFlowRecord>> subFlowRecordsMap) {
Integer state = changeRecord.getState(); Integer state = changeRecord.getState();
String flowNode = changeRecord.getFlowNode();
Long changeConfirmResultTime = changeRecord.getChangeConfirmResultTime(); Long changeConfirmResultTime = changeRecord.getChangeConfirmResultTime();
Long updateTime = changeRecord.getUpdateTime(); Long updateTime = changeRecord.getUpdateTime();
if (ChangeStatusEnum.END.getStatus().equals(state)) { // 先根据节点判断:新老topo的结束节点都是9999
// 已完成工单:展示实际完成时间(updateTime) if (ChangeFlowEnum.END.getNodeId().equals(flowNode) || ChangeFlowEnum.NEW_END.getNodeId().equals(flowNode)) {
// 已结束的工单:展示实际完成时间(updateTime)
changeFlowVO.setChangeEndTime(updateTime); changeFlowVO.setChangeEndTime(updateTime);
changeFlowVO.setIsOverdue(false); changeFlowVO.setIsOverdue(false);
} else if (ChangeStatusEnum.CANCEL.getStatus().equals(state)) { return;
// 取消的工单:展示取消时间(updateTime) }
// 如果节点不是结束节点,再根据状态判断(兼容新老状态:完结和取消合并为一个集合)
Set<Integer> finishedOrCancelledStatusSet = new HashSet<>(Arrays.asList(
ChangeStatusEnum.FINISHED.getStatus(),
ChangeStatusEnum.END.getStatus(),
ChangeStatusEnum.CANCELLED.getStatus(),
ChangeStatusEnum.CANCEL.getStatus()
));
if (finishedOrCancelledStatusSet.contains(state)) {
// 已完成或取消的工单:展示实际完成/取消时间(updateTime)
changeFlowVO.setChangeEndTime(updateTime); changeFlowVO.setChangeEndTime(updateTime);
changeFlowVO.setIsOverdue(false); changeFlowVO.setIsOverdue(false);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment