考试修改完善

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

@@ -151,14 +151,36 @@ public class EBaseService {
     public ResultVo update(EBase model) {
         try {
             EBaseVo exam = eBaseMapper.getExamStateById(model.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() != 0 && exam.getBegintime().compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止编辑");
+            //2022/11/15 禁止修改年级、科目、考试模式
+            model.setGradeid(null);
+            model.setExammode(null);
             eBaseMapper.updateByPrimaryKeySelective(model);
+
             Integer examid = model.getExamid();
-            eBaseMapper.deleteClassAndSubjectById(examid);//删除关联的班级和科目
-            ResultVo vo = saveExam(model, examid);//保存考试基本信息
-            if (vo != null) return vo;
+            List<Integer> classids = model.getClassids();
+            //班级集合为空不处理班级
+            if (N_Utils.isListEmpty(classids)) return new ResultVo(0, "修改成功");
+            if(exam.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, "有重复学生");
+
+            //考试班级
+            List<EClass> classes = eClassMapper.listByClassIds(classids);
+            classes.forEach(c -> c.setExamid(examid));
+            eClassMapper.insertList(classes);
+
+            //考试学生
+            students.forEach(s -> s.setExamid(examid));
+            students = students.stream().filter(s -> !N_Utils.isEmptyInteger(s.getStudentid())).collect(Collectors.toList());
+            if(N_Utils.isListNotEmpty(students)) eClassStudentMapper.insertList(students);
+
             return new ResultVo(0, "修改成功");
         } catch (Exception e) {
             log.error("修改考试失败", e.getMessage());

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

@@ -19,7 +19,7 @@
         select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.showrank
         ,b.examstate,u.username createname,group_concat(distinct es.subjectname order by es.esid separator '|')subjectname
         ,count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
-        ,min(es.esstate)esstate,min(ifnull(ep.correcttype,0))correcttype
+        ,min(es.esstate)esstate,min(es.pstate)pstate,min(ifnull(ep.correcttype,0))correcttype
         ,(case when b.exammode=1 then (count(distinct es.esid)-count(distinct ei.esid))
         else (select sum(ec.classnum)*count(distinct es.esid)-(select count(ps.epsid) from e_paper_student ps
         where ps.examid=b.examid and ps.sstate in(0,1)) from e_class ec

sexam/src/main/resources/mapper/exam/ESubjectMapper.xml

@@ -110,7 +110,7 @@
         update e_base eb left join e_subject es on eb.examid = es.examid
         set es.pstate=1
         where eb.examstate>=1 and eb.deleted=1 and eb.exammode=1
-        and es.pstate=0 and concat(es.sdate,' ',es.begintime)<=now()
+        and es.pstate=0 and es.sdate=current_date() and concat(es.sdate,' ',es.begintime)<=now()
     </update>
     <!--试卷结束考试-->
     <update id="endPaper">