|
|
@@ -976,22 +976,17 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
public List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto) {
|
|
|
List<PanelListVo> list = coreEduTrainingTaskMapper.selectCurUserTaskList(panelListDto);
|
|
|
if (ObjectUtil.isEmpty(list)) {
|
|
|
- log.info("未查询到代办-教育培训任务!");
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
- log.info("查询到教育培训代办数据:{}", JSON.toJSONString(list));
|
|
|
//处理签名数据
|
|
|
dealEduTrainingSign(list, panelListDto);
|
|
|
final ArrayList<Long> list1 = new ArrayList<>();
|
|
|
- log.info("工作台培训任务,当前时间:{}", DateUtil.format(DateUtil.date(),Constants.HMS_FORMAT));
|
|
|
for (PanelListVo item : list) {
|
|
|
if (DateUtil.date().before(item.getStartTime()) || DateUtil.date().after(item.getEndTime())) {
|
|
|
- log.info("培训任务被删除,未到开始时间或已超过截至时间:{}", JSON.toJSONString(item));
|
|
|
list1.add(item.getId());
|
|
|
}
|
|
|
}
|
|
|
list.removeIf(item -> list1.contains(item.getId()));
|
|
|
- //list.removeIf(item -> DateUtil.date().before(item.getStartTime()) || DateUtil.date().after(item.getEndTime()));
|
|
|
list.forEach(item -> {
|
|
|
item.setType(PanelTypeEnums.EDU_TRAINING.getCode());
|
|
|
});
|