fix(training): 修复培训申请流程查询中的审批时间获取问题
parent
a1015af06f
commit
eb83541a29
|
|
@ -42,7 +42,7 @@ public class TrainingApplyProcessAddExe {
|
||||||
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
|
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
|
||||||
.filter(item -> item.getApprovalTime() != null)
|
.filter(item -> item.getApprovalTime() != null)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if(CollUtil.isEmpty( collect)){
|
if(CollUtil.isNotEmpty( collect)){
|
||||||
TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();
|
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);
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ public class TrainingApplyRecordUpdateExe {
|
||||||
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
|
List<TrainingApplyProcessDO> collect = trainingApplyProcessDOList.stream()
|
||||||
.filter(item -> item.getApprovalTime() != null)
|
.filter(item -> item.getApprovalTime() != null)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if(CollUtil.isEmpty( collect)){
|
if(CollUtil.isNotEmpty( collect)){
|
||||||
TrainingApplyProcessDO trainingApplyProcessDO = collect.stream().max((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())).get();
|
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