From 54934638cd1ec613d9f80145a6f0ccffa5a0b772 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 15:05:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(training):=20=E4=BF=AE=E5=A4=8D=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=AE=A1=E6=89=B9=E6=97=B6=E9=97=B4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/query/training/TrainingApplyProcessQueryExe.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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));