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

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

@@ -1,17 +1,14 @@
 package com.xhkjedu.smarking.controller.papercheck;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
 import com.xhkjedu.smarking.service.papercheck.MsPaperCheckService;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷试卷阅卷方式表相关操作
@@ -25,33 +22,91 @@ public class MsPaperCheckController {
     private MsPaperCheckService msPaperCheckService;
 
     /**
-     * @Description 新增
+     * @Description 设置评卷方式
+     * @Date 2024/10/24 14:16
+     * @Author YWX
      * @Param [msPaperCheck]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+     * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsPaperCheck msPaperCheck) {
+    @PostMapping("/set_check_type")
+    public ResultVo setCheckType(@RequestBody MsPaperCheck msPaperCheck) {
+        N_Utils.validation(new Object[]{
+                msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMblockid(), "题块id", 1
+                , msPaperCheck.getChecktype(), "评卷方式", 1
+        });
         msPaperCheckService.add(msPaperCheck);
-        return new ResultVo(0, "保存成功！");
+        return new ResultVo(0, "设置成功");
     }
 
     /**
-     * @Description 列表
+     * @Description 阅卷分配列表
+     * @Date 2024/10/24 14:19
+     * @Author YWX
      * @Param [msPaperCheck]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+     * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsPaperCheck msPaperCheck) {
-        Integer page = msPaperCheck.getPage();
-        Integer size = msPaperCheck.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsPaperCheck> list = msPaperCheckService.queryList(msPaperCheck);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+    @PostMapping("/list_paper_check")
+    public ResultVo listPaperCheck(@RequestBody MsPaperCheck msPaperCheck) {
+        Integer mpid = msPaperCheck.getMpid();
+        N_Utils.validation(new Object[]{
+                mpid, "试卷id", 1
+        });
+        List<Map> list = msPaperCheckService.listPaperCheck(mpid);
+        return new ResultVo(0, "查询成功", list);
+    }
+
+    /**
+     * @Description 设置仲裁教师
+     * @Date 2024/10/24 14:40
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/set_arbitrate")
+    public ResultVo setArbitrate(@RequestBody MsPaperCheck msPaperCheck) {
+        N_Utils.validation(new Object[]{
+                msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMblockid(), "题块id", 1
+                , msPaperCheck.getArbitrateid(), "仲裁教师id", 1
+        });
+        msPaperCheckService.setArbitrate(msPaperCheck);
+        return new ResultVo(0, "设置成功");
+    }
+
+    /**
+     * @Description 设置阅卷教师
+     * @Date 2024/10/24 15:24
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/set_check_teacher")
+    public ResultVo setCheckTeacher(@RequestBody MsPaperCheck msPaperCheck) {
+        N_Utils.validation(new Object[]{
+                msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMblockid(), "题块id", 1
+                , msPaperCheck.getTeachers(), "阅卷教师", 3
+        });
+        msPaperCheckService.setCheckTeacher(msPaperCheck);
+        return new ResultVo(0, "设置成功");
+    }
+
+    /**
+     * @Description 设置分配方式
+     * @Date 2024/10/24 15:42
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/set_dispense_way")
+    public ResultVo setDispenseWay(@RequestBody MsPaperCheck msPaperCheck) {
+        N_Utils.validation(new Object[]{
+                msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMblockid(), "题块id", 1
+                , msPaperCheck.getDispenseway(), "分配方式", 1
+        });
+        msPaperCheckService.setDispenseWay(msPaperCheck);
+        return new ResultVo(0, "设置成功");
     }
 }

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

@@ -18,7 +18,7 @@ public interface MsClassMapper extends TkMapper<MsClass> {
     List<MsClass> listByClassIds(@Param("classids") List<Integer> classids);
 
     //考试班级
-    List<Map> listByExamId(@Param("examid") Integer examid);
+    List<Map> listByExamId(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
 
     //考试关联学校班级
     List<Map> listSchoolClassByExamId(@Param("schoolid") Integer schoolid,@Param("examid") Integer examid);

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

@@ -2,6 +2,10 @@ package com.xhkjedu.smarking.mapper.papercheck;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷试卷阅卷方式表 Mapper 接口
@@ -9,4 +13,9 @@ import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
  * @Date 2024-10-15
  */
 public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
+    //根据题块id获取阅卷方式id
+    Integer getMpcIdByMBlockId(@Param("mblockid") Integer mblockid);
+
+    //阅卷分配列表
+    List<Map> listPaperCheck(@Param("mpid") Integer mpid);
 }

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

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.papercheck;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷批阅分配教师表 Mapper 接口
@@ -9,4 +12,6 @@ import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
  * @Date 2024-10-15
  */
 public interface MsPaperCheckTeacherMapper extends TkMapper<MsPaperCheckTeacher> {
+    //批量保存
+    void batchSave(@Param("list") List<MsPaperCheckTeacher> teachers);
 }

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

@@ -3,8 +3,8 @@ package com.xhkjedu.smarking.model.papercheck;
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description 阅卷试卷阅卷方式表
@@ -39,4 +39,8 @@ public class MsPaperCheck extends BaseBean {
     private Integer createid;
     //创建时间ID
     private Integer createtime;
+
+    @Transient
+    //阅卷教师
+    private List<MsPaperCheckTeacher> teachers;
 }

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

@@ -66,7 +66,7 @@ public class MsSubjectSearchService {
 
     // 按班设置
     public List<Map> listClassTeacher(Integer examid, String subjectid) {
-        List<Map> list = classMapper.listByExamId(examid);
+        List<Map> list = classMapper.listByExamId(examid, subjectid);
         String classids = list.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
         List<Map> teacherList = classMapper.listClassTeacher(classids, subjectid);
         for (Map map : list) {

smarking/src/main/java/com/xhkjedu/smarking/service/notice/NoticeService.java

@@ -131,7 +131,7 @@ public class NoticeService {
             List<TNoticeUser> users = new ArrayList<>();
             List<TMsg> msgList = new ArrayList<>();
             String noticetitle = examname + "-考试公告";
-            List<Map> classes = msClassMapper.listByExamId(examid);
+            List<Map> classes = msClassMapper.listByExamId(examid,null);
             String classids = classes.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
             List<UserVo> teachers = userMapper.listTeacherByClassIds(classids);//获取考试班级任教老师
             if (notice == 1) {

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

@@ -1,11 +1,16 @@
 package com.xhkjedu.smarking.service.papercheck;
 
+import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
+import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherMapper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
+import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description 阅卷试卷阅卷方式表 服务实现类
@@ -16,26 +21,98 @@ import java.util.List;
 public class MsPaperCheckService {
     @Resource
     private MsPaperCheckMapper msPaperCheckMapper;
+    @Resource
+    private MsPaperCheckTeacherMapper msPaperCheckTeacherMapper;
+
+    /**
+     * @Description 设置评卷方式
+     * @Date 2024/10/24 14:16
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return void
+     **/
+    public void add(MsPaperCheck msPaperCheck) {
+        saveOrUpdate(msPaperCheck);
+    }
+
+    //添加或更新阅卷方式
+    private MsPaperCheck saveOrUpdate(MsPaperCheck msPaperCheck) {
+        Integer mpcid = msPaperCheckMapper.getMpcIdByMBlockId(msPaperCheck.getMblockid());
+        if (N_Utils.isTrueInteger(mpcid)) {
+            msPaperCheck.setMpcid(mpcid);
+            msPaperCheckMapper.updateByPrimaryKeySelective(msPaperCheck);
+        } else {
+            msPaperCheck.setCreatetime(N_Utils.getSecondTimestamp());
+            msPaperCheckMapper.insertSelective(msPaperCheck);
+        }
+        return msPaperCheck;
+    }
+
+    /**
+     * @Description 阅卷分配列表
+     * @Date 2024/10/24 14:19
+     * @Author YWX
+     * @Param [mpid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listPaperCheck(Integer mpid) {
+        return msPaperCheckMapper.listPaperCheck(mpid);
+    }
+
+    /**
+     * @Description 设置仲裁教师
+     * @Date 2024/10/24 14:40
+     * @Author YWX
+     * @Param [msPaperCheck]
+     * @Return void
+     **/
+    public void setArbitrate(MsPaperCheck msPaperCheck) {
+        saveOrUpdate(msPaperCheck);
+    }
 
     /**
-     * @Description 新增
+     * @Description 设置阅卷教师
+     * @Date 2024/10/24 15:24
+     * @Author YWX
      * @Param [msPaperCheck]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
+     * @Return void
      **/
-    public void add(MsPaperCheck msPaperCheck){
-        msPaperCheckMapper.insert(msPaperCheck);
+    public void setCheckTeacher(MsPaperCheck msPaperCheck) {
+        MsPaperCheck check = saveOrUpdate(msPaperCheck);
+        Integer mpid = check.getMpid();
+        Integer mblockid = check.getMblockid();
+        Integer createid = msPaperCheck.getCreateid();
+        int timestamp = N_Utils.getSecondTimestamp();
+        List<MsPaperCheckTeacher> teachers = msPaperCheck.getTeachers();
+        for (MsPaperCheckTeacher teacher : teachers) {
+            teacher.setMpid(mpid);
+            teacher.setMblockid(mblockid);
+            teacher.setCreateid(createid);
+            teacher.setCreatetime(timestamp);
+        }
+        msPaperCheckTeacherMapper.insertList(teachers);
     }
 
     /**
-     * @Description 列表
+     * @Description 设置分配方式
+     * @Date 2024/10/24 15:41
+     * @Author YWX
      * @Param [msPaperCheck]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.papercheck.MsPaperCheck>
+     * @Return void
      **/
-    public List<MsPaperCheck> queryList(MsPaperCheck msPaperCheck){
-        return msPaperCheckMapper.selectAll();
+    @Transactional(rollbackFor = Exception.class)
+    public void setDispenseWay(MsPaperCheck msPaperCheck) {
+        Integer dispenseway = msPaperCheck.getDispenseway();
+        if (dispenseway.equals(3)) {
+            List<MsPaperCheckTeacher> teachers = msPaperCheck.getTeachers();
+            if (N_Utils.isListEmpty(teachers)) throw new ServiceException("请选择阅卷教师");
+            for (MsPaperCheckTeacher teacher : teachers) {
+                if (N_Utils.isTrueInteger(teacher.getTasknum())) {
+                    throw new ServiceException("请设置每位教师的阅卷任务数");
+                }
+            }
+            msPaperCheckTeacherMapper.batchSave(teachers);
+        }
+        saveOrUpdate(msPaperCheck);
     }
 }

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

@@ -22,6 +22,10 @@
         select mc.classid,mc.classname
         from ms_class mc left join t_class c on mc.classid = c.classid
         where examid=#{examid}
+        <if test="subjectid!=null and subjectid!='' and subjectid!='0'">
+            and mc.subjectid=#{subjectid}
+        </if>
+        group by mc.classid
         order by c.classtype,c.classorder,mc.mcid
     </select>
     <!--考试关联学校班级-->

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

@@ -13,6 +13,7 @@
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.pstate,s.ptstate,if(ps.sstate=2,ps.mpsid,null) tjnum,count(ps.mpsid) stunum
         ,s.pbstate,s.checkset,p.answered,if(ps.checked=2,ps.mpsid,null) pynum,u.username as teachername
+        ,p.mpid
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join ms_paper_student ps on s.msid = ps.msid
         left join ms_paper p on p.msid = s.msid

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

@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper">
+    <!--根据题块id获取阅卷方式id-->
+    <select id="getMpcIdByMBlockId" resultType="java.lang.Integer">
+        select mpcid from ms_paper_check where mblockid = #{mblockid}
+    </select>
+
+    <resultMap id="paperCheckResultMap" type="java.util.Map">
+        <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
+    </resultMap>
+    <!--题块阅卷教师列表-->
+    <select id="listCheckTeacher" resultType="java.util.Map">
+        select mct.teacherid,u.username as teachername
+        from t_user u,ms_paper_check_teacher mct
+        where u.userid = mct.teacherid and mct.mblockid = #{mblockid}
+    </select>
+    <!--阅卷分配列表-->
+    <select id="listPaperCheck" resultMap="paperCheckResultMap">
+        select pc.mpcid,pb.mpid,pb.mblockid,pb.blockname,pb.blockorder,pb.bqnum,pb.bqscore
+        ,pc.checktype,pc.dispenseway
+        ,if(pc.checktype=2,(select u.username from t_user u where u.userid=pc.arbitrateid),'') as arbitratename
+        from ms_paper_check pc right join ms_paper_block pb on pc.mblockid = pb.mblockid
+        where pb.mpid = #{mpid} and pb.blocktype = 2
+        order by pb.blockorder
+    </select>
 </mapper>

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

@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherMapper">
+    <!--批量保存-->
+    <insert id="batchSave">
+        <foreach collection ="list" item="s" index= "index" separator =";">
+            insert into ms_paper_check_teacher (mpid, mblockid, teacherid, tasknum, createid, createtime)
+            values (#{s.mpid},#{s.mblockid},#{s.teacherid},#{s.tasknum},#{s.createid},#{s.createtime})
+            on duplicate key update tasknum=#{s.tasknum}
+        </foreach>
+    </insert>
 </mapper>