diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyProcessQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyProcessQueryExe.java index ffdbd2f..38ba0ef 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyProcessQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyProcessQueryExe.java @@ -54,7 +54,6 @@ public class TrainingApplyProcessQueryExe { List processList = trainingApplyProcessRepository.getProcessNodeByRecordId(qry.getEqTrainingApplyRecordId()); - TrainingApplyRecordDO byTrainingRecordId = trainingApplyRecordRepository.getByTrainingRecordId(qry.getEqTrainingApplyRecordId()); List flowList = Optional.ofNullable(processList).orElse(Collections.emptyList()) .stream() .map(e -> { @@ -66,8 +65,8 @@ public class TrainingApplyProcessQueryExe { String nodeName = e.getNodeName() == null ? "" : e.getNodeName(); String username = e.getUsername() == null ? "" : e.getUsername(); String time =null; - if(e.getApplyType()!=null && byTrainingRecordId.getApprovalTime()!=null){ - time = byTrainingRecordId.getApprovalTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + if(e.getApplyType()!=null && e.getApprovalTime()!=null){ + time = e.getApprovalTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); } String secondLine = StrUtil.isNotBlank(time) ? (username + " " + time) : username; item.setFlowList(Arrays.asList(nodeName, secondLine));