From 99db5c149e3674f2047713f19e001ca3eeeee254 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 15:38:52 +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 --- .../training/TrainingApplyProcessAddExe.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java index 8c61405..df8a441 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java @@ -1,5 +1,6 @@ package com.zcloud.edu.command.training; +import cn.hutool.core.collection.CollUtil; import com.zcloud.edu.domain.gateway.training.TrainingApplyProcessGateway; import com.zcloud.edu.domain.model.training.TrainingApplyProcessE; import com.zcloud.edu.domain.model.training.TrainingApplyProcessNodeE; @@ -15,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; +import java.util.stream.Collectors; /** @@ -37,9 +39,17 @@ public class TrainingApplyProcessAddExe { List trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(cmd.getTrainingApplyRecordId()); //获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据，将审批时间设置为当前时间 - TrainingApplyProcessDO trainingApplyProcessDO = trainingApplyProcessDOList.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get(); - trainingApplyProcessDO.setApprovalTime(LocalDateTime.now()); - trainingApplyProcessRepository.updateById(trainingApplyProcessDO); + List collect = trainingApplyProcessDOList.stream() + .filter(item -> item.getApprovalTime() != null) + .collect(Collectors.toList()); + if(CollUtil.isEmpty( collect)){ + TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get(); + trainingApplyProcessDO.setApprovalTime(LocalDateTime.now()); + trainingApplyProcessRepository.updateById(trainingApplyProcessDO); + } + + + boolean res = false; try { res = trainingApplyProcessGateway.add(trainingApplyProcessE);