From ffaea5a15c5f0294aa1b4abe21463b615dc5f622 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 17:46:30 +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 --- .../query/training/TrainingApplyProcessQueryExe.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 38ba0ef..266ac7d 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 @@ -3,6 +3,7 @@ package com.zcloud.edu.command.query.training; import cn.hutool.core.util.StrUtil; import com.zcloud.edu.command.convertor.training.TrainingApplyProcessCoConvertor; import com.zcloud.edu.domain.enums.ApplyTypeEnum; +import com.zcloud.edu.domain.enums.ApprovalStatusEnum; import com.zcloud.edu.domain.model.training.TrainingApplyProcessNodeE; import com.zcloud.edu.dto.clientobject.training.FlowCO; import com.zcloud.edu.dto.clientobject.training.TrainingApplyProcessFlowVO; @@ -60,13 +61,17 @@ public class TrainingApplyProcessQueryExe { FlowCO item = new FlowCO(); item.setType(e.getApplyType()); - item.setStatus(e.getApprovalStatus()); + //1 进行中，2：已完成 +// item.setStatus(e.getApprovalStatus()); String nodeName = e.getNodeName() == null ? "" : e.getNodeName(); String username = e.getUsername() == null ? "" : e.getUsername(); String time =null; if(e.getApplyType()!=null && e.getApprovalTime()!=null){ time = e.getApprovalTime().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + item.setStatus(ApprovalStatusEnum.APPROVED.getCode().intValue()); + }else{ + item.setStatus(ApprovalStatusEnum.APPROVING.getCode().intValue()); } String secondLine = StrUtil.isNotBlank(time) ? (username + " " + time) : username; item.setFlowList(Arrays.asList(nodeName, secondLine));