zcloud_gbs
/
zcloud_gbs_edu
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(training): 修复培训申请流程查询中的审批时间获取问题

dev
zhaokai 2026-03-10 16:28:03 +08:00
parent eb83541a29
commit af2a6d1359
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyProcessAddExe.java
View File

@ -40,7 +40,7 @@ public class TrainingApplyProcessAddExe {
List<TrainingApplyProcessDO> trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(cmd.getTrainingApplyRecordId());
//获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据，将审批时间设置为当前时间
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
.filter(item -> item.getApprovalTime() != null)
.filter(item -> item.getApprovalTime() == null)
.collect(Collectors.toList());
if(CollUtil.isNotEmpty( collect)){
TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();

2
web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java
View File

@ -73,7 +73,7 @@ public class TrainingApplyRecordUpdateExe {
List<TrainingApplyProcessDO> trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(trainingApplyRecordUpdateCmd.getTrainingApplyRecordId());
//获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据，将审批时间设置为当前时间
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
.filter(item -> item.getApprovalTime() != null)
.filter(item -> item.getApprovalTime() == null)
.collect(Collectors.toList());
if(CollUtil.isNotEmpty( collect)){
TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();