From 710b1f65394d2077fdb109159d2def32dd3c018c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Sep 2021 18:25:53 +0800
Subject: [PATCH] 培训考试申请修改，日志配置修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index d8916ef..eb200dd 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -46,9 +46,12 @@
@Override
public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
-// trainingRegistrationVos.forEach(trainingRegistrationVo -> {
-// trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
-// });
+ trainingRegistrationVos.forEach(trainingRegistrationVo -> {
+ //如果考试id 为空,考试尚未提交审核
+ if (null==trainingRegistrationVo.getAuditStatus()){
+ trainingRegistrationVo.setAuditStatus(4);
+ }
+ });
return page.setRecords(trainingRegistrationVos);
}
@@ -261,7 +264,9 @@
* @return
*/
@Override
- public List<Long> getTrainIds(Integer number) {
- return baseMapper.getTrainIds(number);
+ public List<Long> getTrainIds(Integer number,Integer serialStart,Integer serialEnd) {
+ serialStart = serialStart -1;
+ serialEnd = serialEnd - serialStart;
+ return baseMapper.getTrainIds(number,serialStart,serialEnd);
}
}
--
Gitblit v1.9.3