Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/java/com/xhkjedu/smarking/controller/exam/MsExamController.java

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.exam.MsExam;
 import com.xhkjedu.smarking.service.exam.MsExamService;
 import com.xhkjedu.smarking.service.notice.NoticeService;
+import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.exam.EBaseVo;
 import com.xhkjedu.smarking.vo.exam.ExamVo;
 import com.xhkjedu.utils.N_Utils;
@@ -93,7 +94,12 @@ public class MsExamController {
         EBaseVo exam = msExamService.getExamStateById(examid);//根据考试id获取考试状态
         String examname = exam.getExamname();
         Integer schoolid = exam.getSchoolid();
-        if (exam.getExammode() == 3 && " :00".equals(exam.getStrtime())) return new ResultVo(1, "还有考试试卷未设置时间");
+        if (exam.getExammode() == 3) {
+            if (" :00".equals(exam.getStrtime())) return new ResultVo(1, "还有考试试卷未设置时间");
+            Long timestamp = Long.valueOf(N_Utils.getSecondTimestamp() + 30 * 60);
+            Long begintime = MarkingUtil.strToTimestamp(exam.getStrtime());
+            if (begintime.compareTo(timestamp) != 1) return new ResultVo(1, "发布时间必须早于最早科目开始考试之前30分钟");
+        }
         if (exam.getWwcnum() != 0) return new ResultVo(1, "还有考试试卷未设置完成");
         if (exam.getPbstate() != 2) return new ResultVo(1, "还有考试试卷题块未设置完成");
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
@@ -125,4 +131,55 @@ public class MsExamController {
         N_Utils.validation(new Object[]{createid, "登录人id", 1});
         return new ResultVo(0, "查询成功", msExamService.listClass(createid));
     }
+
+    /**
+     * @Description 删除
+     * @Date 2024/11/25 16:46
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        msExamService.deleteById(examid);
+        return new ResultVo(0, "删除成功");
+    }
+
+    /**
+     * @Description 取消发布
+     * @Date 2024/11/25 16:58
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qx_fb")
+    public ResultVo qxFb(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        msExamService.qxFb(examid);
+        return new ResultVo(0, "取消发布成功");
+    }
+
+    /**
+     * @Description 修改
+     * @Date 2024/11/25 17:13
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return msExamService.update(msExam);
+    }
+
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "查询成功", msExamService.findById(examid));
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsExamMapper.java

@@ -27,4 +27,13 @@ public interface MsExamMapper extends TkMapper<MsExam> {
     Map findById(@Param("examid") Integer examid);
     //考试状态
     Integer getExamstate(@Param("examid") Integer examid);
+
+    //删除
+    void deleteById(@Param("examid") Integer examid);
+
+    //删除关联的班级
+    void deleteClassById(@Param("examid") Integer examid);
+
+    //更新考试状态
+    void updateExamState(@Param("examid") Integer examid,@Param("examstate") int examstate);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

@@ -57,4 +57,10 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
     List<Integer> listMsidsForEndSubject(@Param("strtime") String strtime);
     //定时任务-科目结束考试
     int updateEndSubject(@Param("timestamp") Integer timestamp,@Param("msids")List<Integer> msids);
+
+    //获取考试科目ids
+    List<String> listSubjectIdsByExamId(@Param("examid") Integer examid);
+
+    //获取考试科目信息
+    List<Map<String,Object>> listByExamId(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentMapper.java

@@ -81,4 +81,6 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
     //补录成绩-清空学生补录分数
     int updateStuScoreForRestoreFillScore(@Param("examid") Integer examid,@Param("studentid") Integer studentid);
 
+    //删除考试学生信息
+    void deleteByExamId(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsExamService.java

@@ -10,8 +10,10 @@ import com.xhkjedu.smarking.model.exam.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.model.stupaper.*;
+import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.exam.EBaseVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -76,8 +78,46 @@ public class MsExamService {
 
     //保存考试基本信息
     private void saveExam(MsExam model, Integer examid) {
-        List<Integer> classids = model.getClassids();
         List<MsSubject> subjects = model.getSubjects();
+        List<String> subjectids = subjects.stream().map(MsSubject::getSubjectid).collect(Collectors.toList());
+        saveClassAndStudent(model, examid, subjectids);//保存考试班级和学生
+
+        //考试科目
+        Integer schoolid = model.getSchoolid();
+        List<MsPaper> papers = new ArrayList<>();//考试试卷
+        for (MsSubject s : subjects) {
+            s.setSchoolid(schoolid);
+            s.setExamid(examid);
+            s.setMsstate(0);
+
+            MsPaper p = new MsPaper();
+            p.setExamid(examid);
+            p.setSubjectid(s.getSubjectid());
+            p.setPtype(0);
+            p.setPnum(0);
+            p.setMergepnum(0);
+            p.setPscore(0.0);
+            p.setAnswered(0);
+            p.setHasfile(0);
+            p.setHearnum(0);
+            papers.add(p);
+        }
+        msSubjectMapper.insertList(subjects);//考试科目
+
+        Integer createid = model.getCreateid();
+        Integer createtime = model.getCreatetime();
+        for (int i = 0; i < papers.size(); i++) {
+            MsPaper ePaper = papers.get(i);
+            ePaper.setMsid(subjects.get(i).getId());
+            ePaper.setCreateid(createid);
+            ePaper.setCreatetime(createtime);
+        }
+        msPaperMapper.insertList(papers);//考试试卷
+    }
+
+    //保存考试班级和学生
+    private void saveClassAndStudent(MsExam model, Integer examid, List<String> subjectids) {
+        List<Integer> classids = model.getClassids();
         if (N_Utils.isListNotEmpty(classids)) {
             if (!model.getExammode().equals(3)) {//线下考试必须有考号
                 Integer num = msClassStudentMapper.getNoExamNoNumByClassIds(classids);//根据班级ids获取没有考号学生数量
@@ -94,10 +134,7 @@ public class MsExamService {
             List<MsClassStudent> studentList = msClassStudentMapper.listByClassIds(classids);
             List<MsClass> classes = new ArrayList<>();
             List<MsClassStudent> students = new ArrayList<>();
-            Integer schoolid = model.getSchoolid();
-            for (MsSubject s : subjects) {
-                s.setSchoolid(schoolid);
-                String subjectid = s.getSubjectid();
+            for (String subjectid : subjectids) {
                 for (MsClass c : classList) {
                     MsClass c1 = new MsClass();
                     c1.setExamid(examid);
@@ -122,36 +159,6 @@ public class MsExamService {
             //考试学生
             if (N_Utils.isListNotEmpty(students)) msClassStudentMapper.insertList(students);
         }
-
-        //考试科目
-        List<MsPaper> papers = new ArrayList<>();//考试试卷
-        for (MsSubject s : subjects) {
-            s.setExamid(examid);
-            s.setMsstate(0);
-
-            MsPaper p = new MsPaper();
-            p.setExamid(examid);
-            p.setSubjectid(s.getSubjectid());
-            p.setPtype(0);
-            p.setPnum(0);
-            p.setMergepnum(0);
-            p.setPscore(0.0);
-            p.setAnswered(0);
-            p.setHasfile(0);
-            p.setHearnum(0);
-            papers.add(p);
-        }
-        msSubjectMapper.insertList(subjects);//考试科目
-
-        Integer createid = model.getCreateid();
-        Integer createtime = model.getCreatetime();
-        for (int i = 0; i < papers.size(); i++) {
-            MsPaper ePaper = papers.get(i);
-            ePaper.setMsid(subjects.get(i).getId());
-            ePaper.setCreateid(createid);
-            ePaper.setCreatetime(createtime);
-        }
-        msPaperMapper.insertList(papers);//考试试卷
     }
 
     /**
@@ -302,4 +309,68 @@ public class MsExamService {
         }
         return msClassMapper.listSchoolClass(schoolid, year, teacherid);
     }
+
+    /**
+     * @Description 删除
+     * @Date 2024/11/25 16:46
+     * @Author YWX
+     * @Param [examid]
+     * @Return void
+     **/
+    public void deleteById(Integer examid) {
+        msExamMapper.deleteById(examid);
+    }
+
+    /**
+     * @Description 取消发布
+     * @Date 2024/11/25 17:33
+     * @Author YWX
+     * @Param [examid]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void qxFb(Integer examid) {
+        EBaseVo exam = msExamMapper.getExamStateById(examid);
+        Long timestamp = Long.valueOf(N_Utils.getSecondTimestamp() + 30 * 60);
+        Long begintime = MarkingUtil.strToTimestamp(exam.getStrtime());
+        if (begintime != 0 && begintime.compareTo(timestamp) != 1) throw new ServiceException("开考前30分钟禁止取消发布");
+        msPaperStudentMapper.deleteByExamId(examid);//删除考试学生信息
+        msExamMapper.updateExamState(examid, 0);//更新考试状态
+    }
+
+    /**
+     * @Description 修改
+     * @Date 2024/11/25 17:13
+     * @Author YWX
+     * @Param [model]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo update(MsExam model) {
+        EBaseVo exam = msExamMapper.getExamStateById(model.getExamid());
+        if (0 != exam.getExamstate()) return new ResultVo(1, "考试已发布禁止操作");
+        Long timestamp = Long.valueOf(N_Utils.getSecondTimestamp() + 30 * 60);
+        Long begintime = MarkingUtil.strToTimestamp(exam.getStrtime());
+        if (begintime != 0 && begintime.compareTo(timestamp) != 1) return new ResultVo(1, "开考前30分钟禁止编辑");
+        //禁止修改年级、科目、考试模式
+        model.setGradeid(null);
+        model.setExammode(null);
+        msExamMapper.updateByPrimaryKeySelective(model);
+        Integer examid = model.getExamid();
+        List<Integer> classids = model.getClassids();
+        //班级集合为空不处理班级
+        if (N_Utils.isListEmpty(classids)) return new ResultVo(0, "修改成功");
+        msExamMapper.deleteClassById(examid);//删除关联的班级
+        List<String> subjectids = msSubjectMapper.listSubjectIdsByExamId(examid);
+        saveClassAndStudent(model, examid, subjectids);//保存考试班级和学生
+
+        return new ResultVo(0, "修改成功");
+    }
+
+    public Map findById(Integer examid) {
+        Map map = msExamMapper.findById(examid);
+        map.put("subjects", msSubjectMapper.listByExamId(examid));
+        map.put("classes",  msClassMapper.listByExamId(examid,null));
+        return map;
+    }
 }

smarking/src/main/resources/mapper/exam/MsExamMapper.xml

@@ -9,6 +9,19 @@
     <update id="postExam">
         update ms_exam set examcomm=#{examcomm},examstate=1 where examid=#{examid}
     </update>
+    <!--删除-->
+    <update id="deleteById">
+        update ms_exam set deleted=10 where examid=#{examid}
+    </update>
+    <!--更新考试状态-->
+    <update id="updateExamState">
+        update ms_exam set examstate=#{examstate} where examid=#{examid}
+    </update>
+    <!--删除关联的班级-->
+    <delete id="deleteClassById">
+        delete c.*,cs.* from ms_class c inner join ms_class_student cs on cs.examid=c.examid and cs.classid=c.classid
+        where c.examid=#{examid} and c.subjectid=cs.subjectid
+    </delete>
     <!--考试科目列表-->
     <select id="listSubject" resultType="java.util.Map">
         select subjectname,if(pstate=1 and ptstate=2 and pbstate=2 and checkstate!=0 and checkset=1

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -116,6 +116,14 @@
         where e.examstate>=1 and e.deleted=1 and e.exammode=3 and ms.msstate=1
         and adddate(concat(ms.sdate,' ',ms.endtime),interval 5 minute) <#{strtime}
     </select>
+    <!--获取考试科目ids-->
+    <select id="listSubjectIdsByExamId" resultType="java.lang.String">
+        select subjectid from ms_subject where examid=#{examid}
+    </select>
+    <!--获取考试科目信息-->
+    <select id="listByExamId" resultType="java.util.Map">
+        select * from ms_subject where examid=#{examid}
+    </select>
     <!--定时任务-科目结束考试-->
     <update id="updateEndSubject">
         update ms_subject ms

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

@@ -265,7 +265,7 @@
             ,psb.mpsbid,null)) as myUncheckedNum
             ,(select group_concat(pbbq.bqn separator '、') from ms_paper_block_question pbbq where pbbq.mblockid = pb.mblockid) as bqn
             from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or pc.dispenseway=2)
+            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
             inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
             where pc.mpid=#{param.mpid}
@@ -283,7 +283,7 @@
             or (psb.secondctime is null and psb.secondcid=#{param.handleid}) or psb.checked=1)
             ,psb.mpsqid,null)) as myUncheckedNum
             from ms_paper_check pc left join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or pc.dispenseway=2) and psb.answered=1
+            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
             inner join ms_paper_qtype_question pb on pc.mblockid = pb.mptqid and pb.mpid = pc.mpid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
             where pc.mpid=#{param.mpid}
@@ -303,8 +303,8 @@
             from ms_paper_check pc inner join ms_class c on pc.mblockid = c.classid
             inner join ms_class_student cs on c.examid=cs.examid and c.subjectid=cs.subjectid and pc.mblockid=cs.classid
             inner join ms_paper_check_teacher pct on pc.mblockid = pct.mblockid and pct.mpid=pc.mpid and pct.teacherid = #{param.handleid}
-            left join ms_paper_student_question psb on psb.mpid = pc.mpid and psb.studentid=cs.studentid and psb.answered=1 and psb.ctype in(3,13,14,15)
-            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1)
+            left join ms_paper_student_question psb on psb.mpid = pc.mpid and psb.studentid=cs.studentid
+            and (psb.firstcid = #{param.handleid} or psb.secondcid = #{param.handleid} or psb.checked=1) and psb.checked!=0
             where pc.mpid=#{param.mpid} and c.subjectid=#{param.subjectid}
             group by c.classid
             order by c.mcid
@@ -373,7 +373,7 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,2 as answertype
-            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_block psq inner join ms_paper_check_teacher_task pctt on psq.mpsbid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
@@ -383,7 +383,7 @@
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,2 as answertype
-            ,psq.mblockid,psq.mpsbid
+            ,psq.mblockid,psq.mpsbid,psq.firstcid
             from ms_paper_student_block psq
             where psq.mpid=#{param.mpid} and psq.mblockid = #{param.mblockid}
             and (psq.checked=1 or (psq.checked=2 and ((psq.firstcid=#{param.teacherid} and psq.firstcime is null)
@@ -504,7 +504,7 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
-            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
@@ -514,7 +514,7 @@
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
-            ,psq.mptqid as mblockid,psq.mpsqid as mpsbid,psq.mptqid
+            ,psq.mptqid as mblockid,psq.mpsqid as mpsbid,psq.mptqid,psq.firstcid
             from ms_paper_student_question psq
             where psq.mpid=#{param.mpid} and psq.mptqid = #{param.mblockid}
             and (psq.checked=1 or (psq.checked=2 and ((psq.firstcid=#{param.teacherid} and psq.firstcime is null)
@@ -544,7 +544,7 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
-            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid
+            ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
@@ -554,7 +554,7 @@
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
-            ,c.classid as mblockid,psq.mpsqid as mpsbid,psq.mptqid
+            ,c.classid as mblockid,psq.mpsqid as mpsbid,psq.mptqid,psq.firstcid
             from ms_paper_student_question psq inner join ms_class c on c.examid=psq.examid and c.subjectid=psq.subjectid
             inner join ms_class_student cs on cs.examid=psq.examid and cs.subjectid=psq.subjectid and cs.studentid=psq.studentid
             where psq.mpid=#{param.mpid} and c.classid = #{param.mblockid}

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -233,6 +233,10 @@
     <delete id="deletePaperStuByMpid">
         delete from ms_paper_student where mpid=#{mpid};
     </delete>
+    <!--删除考试学生信息-->
+    <delete id="deleteByExamId">
+        delete from ms_paper_student where examid=#{examid}
+    </delete>
 
     <!--扫描异常-清空学生扫描试卷信息-->
     <update id="updateStuPaperForScanErrorClear">