考试相关代码提交

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/ExamPaperAnswerController.java

@@ -16,7 +16,6 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.exam.base.BaseApiController;
 import vip.xiaonuo.exam.domain.ExamPaperAnswer;
 import vip.xiaonuo.exam.domain.ExamPaperAnswerInfo;
-import vip.xiaonuo.exam.domain.Subject;
 import vip.xiaonuo.exam.domain.UserEventLog;
 import vip.xiaonuo.exam.domain.enums.ExamPaperAnswerStatusEnum;
 import vip.xiaonuo.exam.event.CalculateExamPaperAnswerCompleteEvent;
@@ -24,7 +23,6 @@ import vip.xiaonuo.exam.event.UserEvent;
 import vip.xiaonuo.exam.service.ExamPaperAnswerService;
 import vip.xiaonuo.exam.service.ExamPaperService;
 import vip.xiaonuo.exam.service.SubjectService;
-import vip.xiaonuo.exam.utility.DateTimeUtil;
 import vip.xiaonuo.exam.utility.ExamUtil;
 import vip.xiaonuo.exam.viewmodel.admin.exam.ExamPaperEditRequestVM;
 import vip.xiaonuo.exam.viewmodel.student.exam.ExamPaperReadVM;
@@ -64,18 +62,6 @@ public class ExamPaperAnswerController extends BaseApiController {
         List<String> studentIds=examPaperAnswerService.studentIds(StpLoginUserUtil.getLoginUser().getId());
         //查出对应学生的试卷
         Page<ExamPaperAnswerVo> pageInfo = examPaperAnswerService.studentPage(model,studentIds);
-        pageInfo.getRecords().forEach(vm -> {
-            if(ObjectUtil.isNotEmpty(vm.getSubjectId()))
-            {
-                Subject subject = subjectService.selectById(vm.getSubjectId());
-                vm.setDoTimeStr(ExamUtil.secondToVM(vm.getDoTime()));
-                vm.setSystemScoreStr(ExamUtil.scoreToVM(vm.getSystemScore()));
-                vm.setUserScoreStr(ExamUtil.scoreToVM(vm.getUserScore()));
-                vm.setPaperScoreStr(ExamUtil.scoreToVM(vm.getPaperScore()));
-                vm.setSubjectName(subject.getName());
-                vm.setCreateTimeStr(DateTimeUtil.dateFormat(vm.getCreateTime()));
-            }
-        });
         return CommonResult.data(pageInfo);
     }
     @ApiOperationSupport(order = 1)

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -161,17 +161,20 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
         }
 
 
-        tExam.setExamType(tExamAddParam.getExamType());
-        this.save(tExam);
         if(tExamAddParam.getStartTime() != null && tExamAddParam.getEndTime() != null){
             Date currentTime = new Date(System.currentTimeMillis());
             // 开始时间与结束时间不能小于当前时间
             if(currentTime.after(tExamAddParam.getStartTime()) || currentTime.after(tExamAddParam.getEndTime())){
                 return  CommonResult.error("开始时间与结束时间不能小于当前时间！！！");
             }
-            this.addJob(tExam, "start");
-            this.addJob(tExam, "end");
+
         }
+        tExam.setExamType(tExamAddParam.getExamType());
+        this.save(tExam);
+
+        this.addJob(tExam, "start");
+        this.addJob(tExam, "end");
+
         List<String> userIds=courseOpenMapper.selectUserId(tExamAddParam.getSemesterId(),tExamAddParam.getCourseId());
         //给课程下关联的学生发送站内信消息
         if(CollectionUtil.isNotEmpty(userIds)&&tExamAddParam.getExamStatus()==1){