发起考试考号判断 移除考试学生

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -73,21 +73,23 @@ public class EBaseService {
             Integer examid = model.getId();
 
             ResultVo vo = saveExam(model, examid);//保存考试基本信息
-            if (vo != null) return vo;
+            if (vo != null) throw new Exception(vo.getMsg());
 
             return new ResultVo(0, "保存成功", examid);
         } catch (Exception e) {
             log.error("发起考试失败", e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new ResultVo(1, "保存失败");
+            return new ResultVo(1, e.getMessage());
         }
     }
 
     //保存考试基本信息
     private ResultVo saveExam(EBase model, Integer examid) {
         List<Integer> classids = model.getClassids();
-        Integer num = eClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
-        if (num != 0) return new ResultVo(1, "有学生没有考号");
+        if(model.getExammode() == 2) {//线下考试必须有考号
+            Integer num = eClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
+            if (num != 0) return new ResultVo(1, "有学生没有考号");
+        }
         List<EClassStudent> students = eClassStudentMapper.listByClassIds(classids);
         int stuNum = students.stream().distinct().collect(Collectors.toList()).size();
         if (stuNum < students.size()) return new ResultVo(1, "有重复学生");
@@ -303,9 +305,10 @@ public class EBaseService {
     public ResultVo delStu(Integer ecsid) {
         EClassStudent student = eClassStudentMapper.selectByPrimaryKey(ecsid);
         EBaseVo exam = eBaseMapper.getExamStateById(student.getExamid());
-        if (2 == exam.getExamstate()) return new ResultVo(1, "考试已结束禁止操作");
+        if (0 != exam.getExamstate()) return new ResultVo(1, "考试已发布禁止操作");
         int timestamp = N_Utils.getSecondTimestamp() + 30 * 60;
-        if (exam.getBegintime().compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止移除学生");
+        Integer begintime = exam.getBegintime();
+        if (begintime != 0 && begintime.compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止移除学生");
         eClassStudentMapper.deleteByPrimaryKey(ecsid);
         eClassMapper.updateClassNumByCsId(student.getExamid(), student.getClassid());
         return new ResultVo(0, "移除考试学生成功");