考试管理

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

@@ -176,10 +176,60 @@ public class MsExamController {
         return msExamService.update(msExam);
     }
 
+    /**
+     * @Description 详情
+     * @Date 2024/11/26 8:51
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
     @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));
     }
+
+    /**
+     * @Description 发布成绩
+     * @Date 2024/11/26 9:10
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/fb_cj")
+    public ResultVo fbCj(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        msExamService.updateExamState(examid,4);
+        return new ResultVo(0, "发布成绩成功");
+    }
+
+    /**
+     * @Description 获取考试关联学校
+     * @Date 2024/11/26 11:44
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_school")
+    public ResultVo listSchool(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "查询成功", msExamService.listSchool(examid));
+    }
+
+    /**
+     * @Description 考试科目列表
+     * @Date 2024/11/26 15:17
+     * @Author YWX
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_subject")
+    public ResultVo listSubject(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "查询成功", msExamService.listSubject(examid));
+    }
 }

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

@@ -72,15 +72,17 @@ public class MsSubjectController {
     @PostMapping("/set_exam_date")
     public ResultVo setExamDate(@RequestBody ExamVo exam) {
         Integer handleid = exam.getHandleid();
+        Integer examid = exam.getExamid();
         N_Utils.validation(new Object[]{
-                exam.getExamid(), "考试id", 1
+                examid, "考试id", 1
                 , exam.getSubjects(), "考试科目", 3
                 , handleid, "设置人id", 1
         });
-        MsExam msExam = msExamMapper.selectByPrimaryKey(exam.getExamid());
+        MsExam msExam = msExamMapper.selectByPrimaryKey(examid);
         if (2 <= msExam.getExamstate()) throw new ServiceException("考试已结束禁止操作");
         List<MsSubject> subjects = exam.getSubjects();
         for (MsSubject subject : subjects) {
+            subject.setExamid(examid);
             String sdate = subject.getSdate();
             if (N_Utils.isEmpty(sdate) || N_Utils.isEmpty(subject.getBegintime()) || N_Utils.isEmpty(subject.getEndtime())) {
                 throw new ServiceException("考试时间不能为空");

smarking/src/main/java/com/xhkjedu/smarking/controller/papercheck/MsPaperCheckController.java

@@ -136,7 +136,7 @@ public class MsPaperCheckController {
                 , msPaperCheck.getCreateid(), "创建人id", 1
                 , msPaperCheck.getCorrecttype(), "批阅设置", 1
         });
-        if (!dispenseway.equals(3) && !N_Utils.isTrueInteger(msPaperCheck.getNumtype())) {
+        if (!dispenseway.equals(2) && !N_Utils.isTrueInteger(msPaperCheck.getNumtype())) {
             return new ResultVo(1, "请选择分配总数");
         }
         msPaperCheckService.setDispenseWay(msPaperCheck);

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

@@ -42,4 +42,10 @@ public interface MsClassMapper extends TkMapper<MsClass> {
 
     //班级选择列表（创建考试用）
     List<Map> listSchoolClass(@Param("schoolid") Integer schoolid, @Param("year") Integer year,@Param("teacherid") Integer teacherid);
+
+    //考试班级名称和人数列表
+    List<Map> listNameAndNumByExamId(@Param("examid") Integer examid);
+
+    //获取考试关联学校
+    List<Map<String, Object>> listSchoolByExamId(@Param("schoolid") Integer schoolid,@Param("examid") Integer examid);
 }

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

@@ -36,4 +36,7 @@ public interface MsExamMapper extends TkMapper<MsExam> {
 
     //更新考试状态
     void updateExamState(@Param("examid") Integer examid,@Param("examstate") int examstate);
+
+    //获取考试学校id
+    Integer getSchoolIdByExamId(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/exam/MsExam.java

@@ -27,7 +27,7 @@ public class MsExam extends BaseBean {
     private Integer exammode;
     //是否启用监控0未启用1启用
     private Integer monitored;
-    //考试状态0未开始1已开始2已结束3已生成报告
+    //考试状态0未开始1已开始2已结束3己生成报告(一键统分)4发布成绩
     private Integer examstate;
     //年级
     private Integer gradeid;

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

@@ -89,6 +89,12 @@ public class MsExamService {
             s.setSchoolid(schoolid);
             s.setExamid(examid);
             s.setMsstate(0);
+            s.setPstate(0);
+            s.setPtstate(0);
+            s.setPbstate(0);
+            s.setCheckstate(0);
+            s.setCheckset(0);
+            s.setInvigilatestate(0);
 
             MsPaper p = new MsPaper();
             p.setExamid(examid);
@@ -100,6 +106,7 @@ public class MsExamService {
             p.setAnswered(0);
             p.setHasfile(0);
             p.setHearnum(0);
+            p.setCorrecttype(0);
             papers.add(p);
         }
         msSubjectMapper.insertList(subjects);//考试科目
@@ -356,6 +363,7 @@ public class MsExamService {
         model.setGradeid(null);
         model.setExammode(null);
         msExamMapper.updateByPrimaryKeySelective(model);
+        model.setExammode(exam.getExammode());
         Integer examid = model.getExamid();
         List<Integer> classids = model.getClassids();
         //班级集合为空不处理班级
@@ -367,10 +375,53 @@ public class MsExamService {
         return new ResultVo(0, "修改成功");
     }
 
+    /**
+     * @Description 详情
+     * @Date 2024/11/26 8:50
+     * @Author YWX
+     * @Param [examid]
+     * @Return java.util.Map
+     **/
     public Map findById(Integer examid) {
+        Map map = msExamMapper.findById(examid);
+        map.put("subjects", msSubjectMapper.listSubjectNameByExamId(examid));
+        map.put("classes",  msClassMapper.listNameAndNumByExamId(examid));
+        return map;
+    }
+
+    /**
+     * @Description 更新考试状态
+     * @Date 2024/11/26 9:12
+     * @Author YWX
+     * @Param [examid, examstate]
+     * @Return void
+     **/
+    public void updateExamState(Integer examid, int examstate) {
+        msExamMapper.updateExamState(examid, examstate);
+    }
+
+    /**
+     * @Description 获取考试关联学校
+     * @Date 2024/11/26 11:49
+     * @Author YWX
+     * @Param [examid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String, Object>> listSchool(Integer examid) {
+        Integer schoolid = msExamMapper.getSchoolIdByExamId(examid);
+        return msClassMapper.listSchoolByExamId(schoolid, examid);
+    }
+
+    /**
+     * @Description 考试科目列表
+     * @Date 2024/11/26 15:17
+     * @Author YWX
+     * @Param [examid]
+     * @Return java.util.Map
+     **/
+    public Map  listSubject(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/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckService.java

@@ -122,6 +122,9 @@ public class MsPaperCheckService {
     @Transactional(rollbackFor = Exception.class)
     public void setDispenseWay(MsPaperCheck msPaperCheck) {
         Integer dispenseway = msPaperCheck.getDispenseway();
+        Integer mpid = msPaperCheck.getMpid();
+        Integer mblockid = msPaperCheck.getMblockid();
+        Integer createid = msPaperCheck.getCreateid();
         if (dispenseway.equals(3)) {
             List<MsPaperCheckTeacher> teachers = msPaperCheck.getTeachers();
             if (N_Utils.isListEmpty(teachers)) throw new ServiceException("请选择阅卷教师");
@@ -129,12 +132,16 @@ public class MsPaperCheckService {
                 if (N_Utils.isTrueInteger(teacher.getTasknum())) {
                     throw new ServiceException("请设置每位教师的阅卷任务数");
                 }
+                teacher.setMpid(mpid);
+                teacher.setMblockid(mblockid);
+                teacher.setCreateid(createid);
+                teacher.setCreatetime(N_Utils.getSecondTimestamp());
                 teacher.setDeleted(1);
             }
             msPaperCheckTeacherMapper.batchSave(teachers);
         }
         saveOrUpdate(msPaperCheck);
-        setBlockTask(msPaperCheck.getMpid(), msPaperCheck.getMblockid());//设置一个题块的批卷任务
+        setBlockTask(mpid, mblockid);//设置一个题块的批卷任务
     }
 
     //设置一个题块的批卷任务

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

@@ -93,4 +93,19 @@
         group by c.classid
         order by c.classtype,c.classorder,c.classid
     </select>
+    <!--考试班级名称和人数列表-->
+    <select id="listNameAndNumByExamId" resultType="java.util.Map">
+        select c.classid,c.classname,count(distinct cs.studentid) as num
+        from ms_class c inner join ms_class_student cs on c.examid=cs.examid and c.classid=cs.classid
+        where c.examid=#{examid}
+        group by c.classid order by c.mcid
+    </select>
+    <!--获取考试关联学校-->
+    <select id="listSchoolByExamId" resultType="java.util.Map">
+        select c.schoolid, s.schoolname
+        from ms_class c inner join t_school s on c.schoolid = s.schoolid
+        where c.examid = #{examid}
+        group by s.schoolid
+        order by if(c.schoolid =#{schoolid}, 0, 1), c.schoolid
+    </select>
 </mapper>

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

@@ -70,4 +70,8 @@
     <select id="getExamstate" resultType="java.lang.Integer">
         select examstate from ms_exam where examid=#{examid}
     </select>
+    <!--获取考试学校id-->
+    <select id="getSchoolIdByExamId" resultType="java.lang.Integer">
+        select schoolid from ms_exam where examid=#{examid}
+    </select>
 </mapper>

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

@@ -122,7 +122,9 @@
     </select>
     <!--获取考试科目信息-->
     <select id="listByExamId" resultType="java.util.Map">
-        select * from ms_subject where examid=#{examid}
+        select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.teacherid,u.username as teachername
+        from ms_subject s left join t_user u on s.teacherid=u.userid
+        where examid=#{examid}
     </select>
     <!--定时任务-科目结束考试-->
     <update id="updateEndSubject">