|
|
@@ -51,7 +51,7 @@ public class ExamServiceImpl implements ExamService {
|
|
|
Exam exam = new Exam(examVO.getExamName(), examVO.getPosition(),
|
|
|
examVO.getSkills(), examVO.getStartTime(),
|
|
|
examVO.getEndTime(), examVO.getComment(), user);
|
|
|
- exam.setIsHidden(false);
|
|
|
+ exam.setIsHidden(0);
|
|
|
// 只有非公开的考试才需要邀请码
|
|
|
if (!examVO.getIsPublic()) {
|
|
|
exam.setIsPublic(0);
|
|
|
@@ -76,10 +76,10 @@ public class ExamServiceImpl implements ExamService {
|
|
|
// List<ExamVO> examVOList = examEntities.get()
|
|
|
// .map(ExamConvertor::convertToVO).collect(Collectors.toList());
|
|
|
// return new ExamListAndNumVO(examVOList, (int) examEntities.getTotalElements());
|
|
|
- List<Exam> exams = examDao.findByIsHiddenFalse();
|
|
|
+ List<Exam> exams = examDao.findByIsHidden(0);
|
|
|
List<ExamVO> examVOList = exams.stream()
|
|
|
.sorted(Comparator.comparing(Exam::getStartTime).reversed())
|
|
|
- .filter(exam -> !exam.getIsHidden())
|
|
|
+ .filter(exam -> exam.getIsHidden() == 0)
|
|
|
.skip(pageSize * (pageNum - 1)).limit(pageSize)
|
|
|
.map(ExamConvertor::convertToVO).collect(Collectors.toList());
|
|
|
User user = userDao.findById(userId).orElse(null);
|
|
|
@@ -168,11 +168,11 @@ public class ExamServiceImpl implements ExamService {
|
|
|
exams.stream()
|
|
|
.sorted(Comparator.comparing(Exam::getStartTime).reversed())
|
|
|
.filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state)
|
|
|
- .filter(exam -> !exam.getIsHidden())
|
|
|
+ .filter(exam -> exam.getIsHidden() == 0)
|
|
|
.skip(pageSize * (pageNum - 1)).limit(pageSize)
|
|
|
.map(ExamConvertor::convertToJoinedVO).collect(Collectors.toList()),
|
|
|
//输出总个数,用于前端分页
|
|
|
- (int) exams.stream().filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state).filter(exam -> !exam.getIsHidden()).count());
|
|
|
+ (int) exams.stream().filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state).filter(exam -> exam.getIsHidden() == 0).count());
|
|
|
} else {
|
|
|
throw new MyServiceException("A0201", "用户账号不存在");
|
|
|
}
|
|
|
@@ -248,4 +248,17 @@ public class ExamServiceImpl implements ExamService {
|
|
|
examDao.save(exam);
|
|
|
return true;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean setIsHidden (Integer userId, Integer examId, Integer hidden){
|
|
|
+ Exam exam = examDao.findById(examId).orElse(null);
|
|
|
+ if (exam == null) {
|
|
|
+ throw new MyServiceException("A0201", "无对应的考试");
|
|
|
+ }
|
|
|
+
|
|
|
+ exam.setIsHidden(hidden);
|
|
|
+ examDao.save(exam);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
}
|