fix(training): 修复培训申请流程查询中的审批时间获取问题
parent
99db5c149e
commit
a1015af06f
|
|
@ -1,5 +1,6 @@
|
||||||
package com.zcloud.edu.command.training;
|
package com.zcloud.edu.command.training;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import com.alibaba.cola.exception.BizException;
|
import com.alibaba.cola.exception.BizException;
|
||||||
import com.zcloud.edu.domain.gateway.training.TrainingApplyRecordGateway;
|
import com.zcloud.edu.domain.gateway.training.TrainingApplyRecordGateway;
|
||||||
import com.zcloud.edu.domain.gateway.training.TrainingApplyUserGateway;
|
import com.zcloud.edu.domain.gateway.training.TrainingApplyUserGateway;
|
||||||
|
|
@ -15,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* web-app
|
* web-app
|
||||||
|
|
@ -70,9 +72,14 @@ public class TrainingApplyRecordUpdateExe {
|
||||||
|
|
||||||
List<TrainingApplyProcessDO> trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(trainingApplyRecordUpdateCmd.getTrainingApplyRecordId());
|
List<TrainingApplyProcessDO> trainingApplyProcessDOList = trainingApplyProcessRepository.getApproveDetailList(trainingApplyRecordUpdateCmd.getTrainingApplyRecordId());
|
||||||
//获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据,将审批时间设置为当前时间
|
//获取ttrainingApplyProcessDOList 中按照创建时间最后一条数据,将审批时间设置为当前时间
|
||||||
TrainingApplyProcessDO trainingApplyProcessDO = trainingApplyProcessDOList.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();
|
List<TrainingApplyProcessDO> 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());
|
trainingApplyProcessDO.setApprovalTime(LocalDateTime.now());
|
||||||
trainingApplyProcessRepository.updateById(trainingApplyProcessDO);
|
trainingApplyProcessRepository.updateById(trainingApplyProcessDO);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue