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

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

@@ -41,7 +41,7 @@ public class MsSubjectController {
     @PostMapping("/exam_overview")
     public ResultVo examOverview(@RequestBody MsSubject msSubject) {
         N_Utils.validation(new Object[]{msSubject.getExamid(), "考试id", 1});
-        return new ResultVo(0, "查询成功！", msSubjectService.examOverview(msSubject));
+        return new ResultVo(0, "查询成功", msSubjectService.examOverview(msSubject));
     }
 
     /**
@@ -59,7 +59,7 @@ public class MsSubjectController {
                 , msSubject.getHandleid(), "设置人id", 1
         });
         msSubjectService.updateById(msSubject);
-        return new ResultVo(0, "设置成功！");
+        return new ResultVo(0, "设置成功");
     }
 
     /**
@@ -75,19 +75,19 @@ public class MsSubjectController {
         N_Utils.validation(new Object[]{
                 exam.getExamid(), "考试id", 1
                 , exam.getSubjects(), "考试科目", 3
-                , handleid, "操作人id", 1
+                , handleid, "设置人id", 1
         });
         MsExam msExam = msExamMapper.selectByPrimaryKey(exam.getExamid());
-        if (2 <= msExam.getExamstate()) throw new ServiceException("考试已结束禁止操作！");
+        if (2 <= msExam.getExamstate()) throw new ServiceException("考试已结束禁止操作");
         List<MsSubject> subjects = exam.getSubjects();
         for (MsSubject subject : subjects) {
             String sdate = subject.getSdate();
             if (N_Utils.isEmpty(sdate) || N_Utils.isEmpty(subject.getBegintime()) || N_Utils.isEmpty(subject.getEndtime())) {
-                throw new ServiceException("考试时间不能为空！");
+                throw new ServiceException("考试时间不能为空");
             } else if (DatesUtil.dateNan(sdate)) {
-                throw new ServiceException("日期格式不正确！");
+                throw new ServiceException("日期格式不正确");
             } else if (N_Utils.isEmpty(subject.getSubjectid()) || N_Utils.isEmpty(subject.getSubjectname())) {
-                throw new ServiceException("科目不能为空！");
+                throw new ServiceException("科目不能为空");
             }
         }
         msSubjectService.setExamDate(subjects, handleid);
@@ -114,7 +114,7 @@ public class MsSubjectController {
                 nt.setUserid(teacherid);
                 nt.setGradeid(gradeid);
                 nt.setSubjectid(s.getSubjectid());
-                n.setUsers(Arrays.asList(nt));
+                n.setUsers(Collections.singletonList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {
@@ -125,7 +125,7 @@ public class MsSubjectController {
             }
         }
         noticeService.batchSave(noticeList, msgList, msExam.getSchoolid(), handleid, 2);
-        return new ResultVo(0, "设置成功！");
+        return new ResultVo(0, "设置成功");
     }
 
     /*
@@ -144,4 +144,42 @@ public class MsSubjectController {
         Map<String, Object> map = msSubjectService.getExamAndSubjectByLeaderid(msSubject.getExamid(),msSubject.getLeaderid());
         return new ResultVo(0, "获取成功",map);
     }
+
+    /**
+     * @Description 开始阅卷
+     * @Date 2024/10/25 9:53
+     * @Author YWX
+     * @Param [msSubject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/start_check")
+    public ResultVo startCheck(@RequestBody MsSubject msSubject) {
+        Integer msid = msSubject.getMsid();
+        Integer handleid = msSubject.getHandleid();
+        N_Utils.validation(new Object[]{
+                msid, "考试科目id", 1
+                , handleid, "设置人id", 1
+        });
+        msSubjectService.updateCheckState(msid, handleid, 1);
+        return new ResultVo(0, "开始成功");
+    }
+
+    /**
+     * @Description 停止阅卷
+     * @Date 2024/10/25 9:54
+     * @Author YWX
+     * @Param [msSubject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/stop_check")
+    public ResultVo stopCheck(@RequestBody MsSubject msSubject) {
+        Integer msid = msSubject.getMsid();
+        Integer handleid = msSubject.getHandleid();
+        N_Utils.validation(new Object[]{
+                msid, "考试科目id", 1
+                , handleid, "设置人id", 1
+        });
+        msSubjectService.updateCheckState(msid, handleid, 2);
+        return new ResultVo(0, "停止成功");
+    }
 }

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

@@ -109,4 +109,55 @@ public class MsPaperCheckController {
         msPaperCheckService.setDispenseWay(msPaperCheck);
         return new ResultVo(0, "设置成功");
     }
+
+    /**
+     * @Description 题块阅卷教师列表
+     * @Date 2024/10/25 9:05
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_check_teacher")
+    public ResultVo listCheckTeacher(@RequestBody MsPaperCheck msPaperCheck) {
+        Integer mblockid = msPaperCheck.getMblockid();
+        N_Utils.validation(new Object[]{
+                mblockid, "题块id", 1
+        });
+        List<Map> list = msPaperCheckService.listCheckTeacher(mblockid);
+        return new ResultVo(0, "查询成功", list);
+    }
+
+    /**
+     * @Description 获取试卷分配总数
+     * @Date 2024/10/25 11:29
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_dispense_num")
+    public ResultVo getDispenseNum(@RequestBody MsPaperCheck msPaperCheck) {
+        Integer mpid = msPaperCheck.getMpid();
+        N_Utils.validation(new Object[]{
+                mpid, "试卷id", 1
+        });
+        return new ResultVo(0, "获取成功", msPaperCheckService.getDispenseNum(mpid));
+    }
+
+    /**
+     * @Description 添加任务
+     * @Date 2024/10/25 17:45
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/add_task_to_teacher")
+    public ResultVo addTaskToTeacher(@RequestBody MsPaperCheck msPaperCheck) {
+        N_Utils.validation(new Object[]{
+                msPaperCheck.getMblockid(), "题块id", 1
+                ,msPaperCheck.getTeacherid(), "教师id", 1
+                ,msPaperCheck.getTeachers(), "任务教师", 3
+        });
+        msPaperCheckService.addTaskToTeacher(msPaperCheck);
+        return new ResultVo(0, "添加任务成功");
+    }
 }

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

@@ -35,4 +35,7 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
 
     //获取考试下所有科目名称
     List<Map<String,String>> listSubjectNameByExamId(@Param("examid") Integer examid);
+
+    //根据试卷id获取阅卷状态
+    Integer getCheckStateByMpId(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckMapper.java

@@ -18,4 +18,7 @@ public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
 
     //阅卷分配列表
     List<Map> listPaperCheck(@Param("mpid") Integer mpid);
+
+    //获取试卷分配总数
+    Map getDispenseNum(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckTeacherMapper.java

@@ -5,6 +5,7 @@ import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷批阅分配教师表 Mapper 接口
@@ -14,4 +15,10 @@ import java.util.List;
 public interface MsPaperCheckTeacherMapper extends TkMapper<MsPaperCheckTeacher> {
     //批量保存
     void batchSave(@Param("list") List<MsPaperCheckTeacher> teachers);
+
+    //题块阅卷教师列表
+    List<Map> listCheckTeacher(@Param("mblockid") Integer mblockid);
+
+    //根据题块id查询批阅教师任务信息
+    MsPaperCheckTeacher findByBlockId(@Param("mblockid") Integer mblockid,@Param("teacherid") Integer teacherid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/papercheck/MsPaperCheck.java

@@ -43,4 +43,10 @@ public class MsPaperCheck extends BaseBean {
     @Transient
     //阅卷教师
     private List<MsPaperCheckTeacher> teachers;
+    @Transient
+    //分配总数1已上传试卷数2报名学生总数
+    private Integer numtype;
+    @Transient
+    //教师ID
+    private Integer teacherid;
 }

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

@@ -1,6 +1,5 @@
 package com.xhkjedu.smarking.service.exam;
 
-import com.xhkjedu.smarking.mapper.exam.MsExamMapper;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.model.exam.MsSubject;
 import com.xhkjedu.utils.N_Utils;
@@ -19,8 +18,6 @@ import java.util.Map;
 public class MsSubjectService {
     @Resource
     private MsSubjectMapper msSubjectMapper;
-    @Resource
-    private MsExamMapper msExamMapper;
 
     /**
      * @Description 考试进度总览
@@ -60,4 +57,20 @@ public class MsSubjectService {
     public Map<String,Object> getExamAndSubjectByLeaderid(Integer examid,Integer leaderid){
         return msSubjectMapper.getExamLeadSubjects(examid,leaderid);
     }
+
+    /**
+     * @Description 修改阅卷状态
+     * @Date 2024/10/25 9:53
+     * @Author YWX
+     * @Param [msid, handleid, checkstate]
+     * @Return void
+     **/
+    public void updateCheckState(Integer msid, Integer handleid, int checkstate) {
+        MsSubject msSubject = new MsSubject();
+        msSubject.setMsid(msid);
+        msSubject.setHandleid(handleid);
+        msSubject.setCheckstate(checkstate);
+        msSubject.setHandletime(N_Utils.getSecondTimestamp());
+        msSubjectMapper.updateByPrimaryKeySelective(msSubject);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckService.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.smarking.service.papercheck;
 
 import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherMapper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
@@ -23,6 +24,8 @@ public class MsPaperCheckService {
     private MsPaperCheckMapper msPaperCheckMapper;
     @Resource
     private MsPaperCheckTeacherMapper msPaperCheckTeacherMapper;
+    @Resource
+    private MsSubjectMapper msSubjectMapper;
 
     /**
      * @Description 设置评卷方式
@@ -32,11 +35,13 @@ public class MsPaperCheckService {
      * @Return void
      **/
     public void add(MsPaperCheck msPaperCheck) {
+        Integer checkstate = msSubjectMapper.getCheckStateByMpId(msPaperCheck.getMpid());//根据试卷id获取阅卷状态
+        if (checkstate.equals(0)) throw new ServiceException("开始阅卷后不支持修改");
         saveOrUpdate(msPaperCheck);
     }
 
     //添加或更新阅卷方式
-    private MsPaperCheck saveOrUpdate(MsPaperCheck msPaperCheck) {
+    private void saveOrUpdate(MsPaperCheck msPaperCheck) {
         Integer mpcid = msPaperCheckMapper.getMpcIdByMBlockId(msPaperCheck.getMblockid());
         if (N_Utils.isTrueInteger(mpcid)) {
             msPaperCheck.setMpcid(mpcid);
@@ -45,7 +50,6 @@ public class MsPaperCheckService {
             msPaperCheck.setCreatetime(N_Utils.getSecondTimestamp());
             msPaperCheckMapper.insertSelective(msPaperCheck);
         }
-        return msPaperCheck;
     }
 
     /**
@@ -77,10 +81,11 @@ public class MsPaperCheckService {
      * @Param [msPaperCheck]
      * @Return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void setCheckTeacher(MsPaperCheck msPaperCheck) {
-        MsPaperCheck check = saveOrUpdate(msPaperCheck);
-        Integer mpid = check.getMpid();
-        Integer mblockid = check.getMblockid();
+        saveOrUpdate(msPaperCheck);
+        Integer mpid = msPaperCheck.getMpid();
+        Integer mblockid = msPaperCheck.getMblockid();
         Integer createid = msPaperCheck.getCreateid();
         int timestamp = N_Utils.getSecondTimestamp();
         List<MsPaperCheckTeacher> teachers = msPaperCheck.getTeachers();
@@ -115,4 +120,40 @@ public class MsPaperCheckService {
         }
         saveOrUpdate(msPaperCheck);
     }
+
+    /**
+     * @Description 题块阅卷教师列表
+     * @Date 2024/10/25 9:05
+     * @Author YWX
+     * @Param [mblockid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listCheckTeacher(Integer mblockid) {
+        return msPaperCheckTeacherMapper.listCheckTeacher(mblockid);
+    }
+
+    /**
+     * @Description 获取试卷分配总数
+     * @Date 2024/10/25 11:29
+     * @Author YWX
+     * @Param [mpid]
+     * @Return java.util.Map
+     **/
+    public Map getDispenseNum(Integer mpid) {
+        return msPaperCheckMapper.getDispenseNum(mpid);
+    }
+
+    /**
+     * @Description 添加任务
+     * @Date 2024/10/25 17:57
+     * @Author YWX
+     * @Param [check]
+     * @Return void
+     **/
+    public void addTaskToTeacher(MsPaperCheck check) {
+        MsPaperCheckTeacher teacher = msPaperCheckTeacherMapper.findByBlockId(check.getMblockid(), check.getTeacherid());
+        if (teacher == null) {
+            throw new ServiceException("教师未分配该题块");
+        }
+    }
 }

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

@@ -48,6 +48,10 @@
     <select id="listSubjectNameByExamId" resultType="java.util.Map">
         select subjectid,subjectname from ms_subject where examid=#{examid}
     </select>
+    <!--根据试卷id获取阅卷状态-->
+    <select id="getCheckStateByMpId" resultType="java.lang.Integer">
+        select s.checkstate from ms_paper p inner join ms_subject s on p.msid=s.msid where p.mpid=#{mpid}
+    </select>
 
     <!--更改科目试卷模板设置状态-->
     <update id="updatePtstateByMpid">

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

@@ -24,4 +24,9 @@
         where pb.mpid = #{mpid} and pb.blocktype = 2
         order by pb.blockorder
     </select>
+    <!--获取试卷分配总数-->
+    <select id="getDispenseNum" resultType="java.util.Map">
+        select count(*) as signupnum,count(if(ps.sstate=2,1,null)) as commitnum
+        from ms_paper_student ps where ps.mpid = #{mpid}
+    </select>
 </mapper>

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

@@ -9,4 +9,17 @@
             on duplicate key update tasknum=#{s.tasknum}
         </foreach>
     </insert>
+    <!--题块阅卷教师列表-->
+    <select id="listCheckTeacher" resultType="java.util.Map">
+        select pct.mpid,pct.mblockid,pct.teacherid,pct.tasknum,u.username as teachername
+        ,count(if(pctt.checkstate=3,1,null)) as checknum
+        from ms_paper_check_teacher pct left join t_user u on pct.teacherid = u.userid
+        left join ms_paper_check_teacher_task pctt on  pct.mblockid = pctt.mblockid and pct.teacherid = pctt.teacherid
+        where pct.mblockid = #{mblockid}
+        group by pct.teacherid
+    </select>
+    <!--根据题块id查询批阅教师任务信息-->
+    <select id="findByBlockId" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
+        select * from ms_paper_check_teacher where mblockid = #{mblockid} and teacherid = #{teacherid} limit 1
+    </select>
 </mapper>