|
@@ -284,6 +284,7 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
|
|
|
// 任务ID、任务类型
|
|
|
model.setTaskId(task.getId());
|
|
|
model.setTaskName(taskTypeNameMap.getOrDefault(task.getTaskTypeId(), ""));
|
|
|
+ model.setTaskCreateTime(DateUtil.formatLocalDateTime(task.getCreateTime()));
|
|
|
|
|
|
// 判断事业部总经理及之前审核状态(
|
|
|
// 1.总经理未审之前,前面节点未拒绝的,则认为是审核中;
|
|
@@ -296,7 +297,6 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
|
|
|
SysCheckChainNodeCheckHistory lastCheckHis = chainNodeCheckHistorys.get(chainNodeCheckHistorys.size() - 1);
|
|
|
model.setTaskStatus(Boolean.TRUE.equals(lastCheckHis.getCheckResult()) ?
|
|
|
lastCheckHis.getNodeId() == 6 ? "审核通过" : "审核中" : "已拒绝");
|
|
|
- model.setTaskCreateTime(DateUtil.formatLocalDateTime(lastCheckHis.getCreateTime()));
|
|
|
model.setRejectReason(lastCheckHis.getCheckMsg());
|
|
|
}
|
|
|
models.add(model);
|