Bläddra i källkod

fix: 修改我参与的测试isJoined为true

weijin 4 år sedan
förälder
incheckning
a6a8d2a420

+ 11 - 0
src/main/java/com/nju/edu/eval/service/convertor/ExamConvertor.java

@@ -27,6 +27,17 @@ public class ExamConvertor {
         return examVO;
     }
 
+    public static ExamVO convertToJoinedVO(Exam exam) {
+        ExamVO examVO = new ExamVO();
+        BeanUtils.copyProperties(exam, examVO);
+        examVO.setExamId(exam.getId());
+        examVO.setCreatorId(exam.getCreator().getId());
+        examVO.setAntiCheating(exam.getAntiCheating() == 1);
+        examVO.setIsPublic(exam.getIsPublic() == 1);
+        examVO.setIsJoined(true);
+        return examVO;
+    }
+
     public static ExamInfoVO convertToExamInfoVO(Exam exam) {
         ExamInfoVO examInfoVO = new ExamInfoVO();
         BeanUtils.copyProperties(exam, examInfoVO);

+ 2 - 1
src/main/java/com/nju/edu/eval/service/serviceImpl/ExamServiceImpl.java

@@ -155,11 +155,12 @@ public class ExamServiceImpl implements ExamService {
         User student = userDao.findById(id).orElse(null);
         if (student != null) {
             List<Exam> exams = student.getExams();
+
             return new ExamListAndNumVO(
                     exams.stream().sorted(Comparator.comparing(Exam::getStartTime).reversed())
                             .filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state)
                             .skip(pageSize * (pageNum - 1)).limit(pageSize)
-                            .map(ExamConvertor::convertToVO).collect(Collectors.toList()),
+                            .map(ExamConvertor::convertToJoinedVO).collect(Collectors.toList()),
                     //输出总个数,用于前端分页
                     (int) exams.stream().filter(exam -> state == 0 || exam.getState().ordinal() + 1 == state).count());
         } else {