批阅

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.service.papercheck.MsPaperCheckTeacherTaskService;
 import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
+import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -132,6 +133,26 @@ public class MsPaperCheckTeacherTaskController {
         return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.getCorrectBlock(param));
     }
 
+    /**
+     * @Description 批阅
+     * @Date 2024/11/12 10:00
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/correct")
+    public ResultVo correct(@RequestBody MsPaperCheckVo param) {
+        N_Utils.validation(new Object[]{
+                param.getHandleid(), "操作人ID", 1
+                , param.getMpid(), "试卷ID", 1
+                , param.getMblockid(), "题块ID", 1
+                , param.getChecktype(), "批阅情况", 1
+                , param.getMpsbid(), "学生试题ID", 1
+        });
+        msPaperCheckTeacherTaskService.correct(param);
+        return new ResultVo(0, "保存成功");
+    }
+
     /**
      * @Description 阅卷进度-按试题
      * @Date 2024/11/8 16:19

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

@@ -78,4 +78,7 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
 
     //获取教师批阅数量
     MsPaperCheckTeacher getCheckNum(@Param("param") MsPaperCheck paperCheck);
+
+    //教师批阅-批阅试题
+    void correct(@Param("param") MsPaperCheckVo param);
 }

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

@@ -42,4 +42,7 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
     Integer updateBatchStuAnswerForScan(@Param("list") List<MsPaperStudentQuestion> list);
     //扫描记录-查看原卷-客观题保存-获取学生答案
     List<MsPaperStudentQuestion> listStuQuestionsByMspidAnbBlockid(@Param("mspid") Integer mspid,@Param("mblockid") Integer mblockid);
+
+    //更新学生单题批阅信息
+    void checkByMptqidAndStudentId(@Param("list") List<MsPaperStudentQuestion> list,@Param("block") MsPaperStudentBlock block);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaperBlockQuestion.java

@@ -3,8 +3,7 @@ package com.xhkjedu.smarking.model.paper;
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description 阅卷试卷题块试题表
@@ -29,12 +28,17 @@ public class MsPaperBlockQuestion extends BaseBean {
     private String bqn;
     //试题分值
     private Double bqscore;
+    @Transient
+    //学生得分
+    private Double stuscore;
     //排序/首个题号
     private Integer bqorder;
     //合并给分点试卷试题ID集合
     private String mergeqid;
     //合并给分点试卷试题题号集合
     private String mergeqn;
+    //合并给分点试卷试题分值集合
+    private String mergescore;
     //给分步长方式1等间隔2特定分数
     private Integer scorestepway;
     //给分步长内容

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentQuestion.java

@@ -92,6 +92,10 @@ public class MsPaperStudentQuestion extends BaseBean {
     private Integer problemtype;
     //疑难备注
     private String problemcomm;
+    //是否最终批改结果0否1是
+    private Integer hasfinal;
+    //最终批改原因1仲裁2学科组成批
+    private Integer finalreason;
 
     //少选分值
     @Transient

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

@@ -7,10 +7,12 @@ import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherTaskMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
+import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
+import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
 import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
 import com.xhkjedu.utils.N_Utils;
@@ -239,6 +241,8 @@ public class MsPaperCheckTeacherTaskService {
                 }
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
+            sq.setChecktype(checktype);
+            sq.setMpid(paperCheck.getMpid());
         }
         Map map = new HashMap();
         map.put("sq", sq);
@@ -279,4 +283,101 @@ public class MsPaperCheckTeacherTaskService {
         List<Map> list = msPaperCheckTeacherTaskMapper.detailByQuestion(mpid, mblockid, dispenseway, check.getChecktype());
         return setListNum(dispenseway, list);
     }
+
+    /**
+     * @Description 批阅
+     * @Date 2024/11/12 10:02
+     * @Author YWX
+     * @Param [param]
+     * @Return void
+     **/
+    public void correct(MsPaperCheckVo param) {
+        MsPaperCheck check = msPaperCheckMapper.findByMBlockId(param.getMpid(), param.getMblockid());
+        if (check == null) {
+            throw new ServiceException("该阅卷任务不存在");
+        } else if (check.getCheckstate().equals(0)) {
+            throw new ServiceException("该阅卷任务未开始");
+        } else if (check.getCheckstate().equals(2)) {
+            throw new ServiceException("该阅卷任务已暂停");
+        }
+        Integer checktype = check.getChecktype();
+        Integer correcttype = check.getCorrecttype();
+        Integer mpsbid = param.getMpsbid();
+        Integer hasgood = param.getHasgood();
+        Integer hasbad = param.getHasbad();
+        Integer hasproblem = param.getHasproblem();
+        Integer problemtype = param.getProblemtype();
+        String problemcomm = param.getProblemcomm();
+        Double qscore = param.getQscore();
+        List<MsPaperBlockQuestion> questions = param.getQuestions();
+        int checked = 1;
+        if (checktype.equals(1)) {//单评
+            if (hasproblem.equals(0)) {
+                checked = 2;
+            }
+            Double firstccore = param.getFirstccore();
+            if (correcttype.equals(3)) {//按题块批阅
+                //题块批阅信息
+                MsPaperStudentBlock block = new MsPaperStudentBlock();
+                block.setMpsbid(mpsbid);
+                block.setChecked(checked);
+                block.setFirstcime(N_Utils.getSecondTimestamp());
+                block.setFirstccore(firstccore);
+                block.setHasgood(hasgood);
+                block.setHasbad(hasbad);
+                block.setHasproblem(hasproblem);
+                block.setProblemtype(problemtype);
+                block.setProblemcomm(problemcomm);
+                msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
+                block.setStudentid(param.getStudentid());
+                block.setMblockid(param.getMblockid());
+
+                List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
+                for (MsPaperBlockQuestion question : questions) {
+                    Double stuscore = question.getStuscore();
+                    if (N_Utils.isTrueInteger(question.getMptqid())) {
+                        MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                        studentQuestion.setMptqid(question.getMptqid());
+                        studentQuestion.setFirstccore(stuscore);
+                        studentQuestion.setStuscore(stuscore);
+                        studentQuestions.add(studentQuestion);
+                    } else {
+                        String[] mptqids = question.getMergeqid().split(",");
+                        String[] mergescores = question.getMergescore().split(",");
+                        double[] scores = new double[mergescores.length];
+                        int last = mergescores.length - 1;
+                        double score = 0;
+                        for (int i = 0; i < mergescores.length; i++) {
+                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergescores[i], qscore), stuscore);
+                            score = MarkingUtil.add(score, scores[i]);
+                            if (i == last) {
+                                scores[i] = MarkingUtil.sub(stuscore, score);
+                            }
+                        }
+                        for (int i = 0; i < mptqids.length; i++) {
+                            MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                            studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));
+                            studentQuestion.setFirstccore(scores[i]);
+                            studentQuestion.setStuscore(scores[i]);
+                            studentQuestions.add(studentQuestion);
+                        }
+                    }
+                }
+                msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
+            } else {//按试题批阅
+                MsPaperStudentQuestion question = new MsPaperStudentQuestion();
+                question.setMpsqid(mpsbid);
+                question.setChecked(checked);
+                question.setFirstcime(N_Utils.getSecondTimestamp());
+                question.setFirstccore(firstccore);
+                question.setHasgood(hasgood);
+                question.setHasbad(hasbad);
+                question.setHasproblem(hasproblem);
+                question.setProblemtype(problemtype);
+                question.setProblemcomm(problemcomm);
+                msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
+            }
+        }
+        msPaperCheckTeacherTaskMapper.correct(param);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -159,6 +159,19 @@ public class MarkingUtil {
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.multiply(b2).doubleValue();
     }
+
+    /**
+     * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 小数点以后2位，以后的数字舍弃。
+     * @param v1 被除数
+     * @param v2 除数
+     * @return 两个参数的商
+     */
+    public static double div(Object v1, Object v2) {
+        BigDecimal b1 = new BigDecimal(v1.toString());
+        BigDecimal b2 = new BigDecimal(v2.toString());
+        return b1.divide(b2, 2, BigDecimal.ROUND_DOWN).doubleValue();
+    }
+
     /**
      * 提供精确的减法运算。
      *

smarking/src/main/java/com/xhkjedu/smarking/vo/papercheck/MsPaperCheckVo.java

@@ -1,7 +1,10 @@
 package com.xhkjedu.smarking.vo.papercheck;
 
+import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Description 阅卷分配VO
  * @Author YWX
@@ -33,8 +36,12 @@ public class MsPaperCheckVo {
     private Integer secondcid;
     //单评批改时间
     private Integer firstcime;
+    //单评批改分值
+    private Double firstccore;
     //复评批改时间
     private Integer secondctime;
+    //复评批改分值
+    private Double secondcscore;
     //仲裁人
     private Integer arbitrateid;
     //仲裁时间
@@ -43,4 +50,23 @@ public class MsPaperCheckVo {
     private Double arbitratescore;
     //批阅情况1一评2二评
     private Integer checktype;
+    //操作人ID
+    private Integer handleid;
+
+    //得分数组
+    private String checkscore;
+    //疑难0默认1疑难
+    private Integer hasproblem;
+    //疑难类型1图形模糊2答题错位3没有图像4图像颠倒5其他问题
+    private Integer problemtype;
+    //疑难备注
+    private String problemcomm;
+    //优秀试卷0默认1优秀
+    private Integer hasgood;
+    //违纪试卷0默认1违纪
+    private Integer hasbad;
+    //学生ID
+    private Integer studentid;
+    //题块试题列表
+    private List<MsPaperBlockQuestion> questions;
 }

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

@@ -35,6 +35,12 @@
         set checkstate = #{checkstate}
         where mpid=#{mpid} and mpsbid=#{mpsbid} and teacherid=#{teacherid}
     </update>
+    <!--教师批阅-批阅试题-->
+    <update id="correct">
+        update ms_paper_check_teacher_task
+        set checkstate = 3,checkscore = #{checkscore}
+        where mpid=#{mpid} and mpsbid=#{mpsbid} and teacherid=#{teacherid}
+    </update>
     <!--删除教师阅卷任务-->
     <delete id="deleteByMpsbids">
         delete from ms_paper_check_teacher_task where mpsbid in (${mpsbids})
@@ -213,7 +219,20 @@
         order by pb.blockorder
     </select>
     <!--教师阅卷-题块列表-->
-    <select id="listTeacherBlock" resultType="java.util.Map">
+    <resultMap id="teacherBlockResultMap" type="java.util.Map">
+        <result property="mblockid" column="mblockid"/>
+        <result property="blockname" column="blockname"/>
+        <result property="blockorder" column="blockorder"/>
+        <result property="bqnum" column="bqnum"/>
+        <collection property="questions" select="listQuestion" column="mblockid"/>
+    </resultMap>
+    <select id="listQuestion" resultType="java.util.Map">
+        select pbq.mbqid,pbq.mptqid,pbq.mbqtype,pbq.bqscore,pbq.bqorder,pbq.bqn
+        ,pbq.mergeqid,pbq.mergeqn,pbq.mergescore,pbq.scorestepway,pbq.scorestep
+        from ms_paper_block_question pbq where pbq.mblockid=#{mblockid}
+        order by pbq.bqn
+    </select>
+    <select id="listTeacherBlock" resultMap="teacherBlockResultMap">
         select pct.mblockid,pb.blockname,pb.blockorder,pb.bqnum
         from ms_paper_block pb inner join ms_paper_check_teacher pct on pb.mblockid = pct.mblockid
         and pct.teacherid = #{param.handleid}
@@ -235,7 +254,7 @@
     <select id="getCorrectBlock" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
-            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.studentid
             from ms_paper_student_block psb inner join ms_paper_check_teacher_task pctt on psb.mpsbid = pctt.mpsbid and psb.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             order by field(pctt.checkstate,2,1,3),pctt.taskorder
@@ -243,7 +262,7 @@
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psb.mblockid,psb.mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
-            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.studentid
             from ms_paper_student_block psb
             where psb.mpid=#{param.mpid} and psb.mblockid = #{param.mblockid}
             and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}

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

@@ -141,6 +141,62 @@
             <if test="q.mptqid!=null and q.mptqid!=0">and mptqid=#{q.mptqid}</if>
         </foreach>
     </update>
+    <!--更新学生单题批阅信息-->
+    <update id="checkByMptqidAndStudentId">
+        update ms_paper_student_question set checked=#{block.checked}
+        <trim prefix="stuscore = case mptqid" suffix="end,">
+            <foreach collection="list" item="q" separator="when">
+                #{q.mptqid} then ifnull(#{q.stuscore},stuscore)
+            </foreach>
+        </trim>
+        <if test="block.firstcime!=null and block.firstcime!=0">
+            <trim prefix="firstccore = case mptqid" suffix="end,">
+               <foreach collection="list" item="q" separator="when">
+                   #{q.mptqid} then #{q.firstccore}
+               </foreach>
+            </trim>
+            <trim prefix="firstcime = case mptqid" suffix="end,">
+                <foreach collection="list" item="q" separator="when">
+                    #{q.mptqid} then #{q.firstcime}
+                </foreach>
+            </trim>
+        </if>
+        <if test="block.secondctime!=null and block.secondctime!=0">
+            <trim prefix="secondcscore = case mptqid" suffix="end,">
+                <foreach collection="list" item="q" separator="when">
+                    #{q.mptqid} then #{q.secondcscore}
+                </foreach>
+            </trim>
+            <trim prefix="secondctime = case mptqid" suffix="end,">
+                <foreach collection="list" item="q" separator="when">
+                    #{q.mptqid} then #{q.secondctime}
+                </foreach>
+            </trim>
+        </if>
+        <if test="block.hasgood!=null and block.hasgood!=0">
+           ,hasgood=#{block.hasgood}
+        </if>
+        <if test="block.hasbad!=null and block.hasbad!=0">
+           ,hasbad=#{block.hasbad}
+        </if>
+        <if test="block.hasproblem!=null and block.hasproblem!=0">
+           ,hasproblem=#{block.hasproblem}
+        </if>
+        <if test="block.problemtype!=null and block.problemtype!=0">
+           ,problemtype=#{block.problemtype}
+        </if>
+        <if test="block.problemcomm!=null and block.problemcomm!=''">
+           ,problemcomm=#{block.problemcomm}
+        </if>
+        <if test="block.hasfinal!=null and block.hasfinal!=0">
+           ,hasfinal=#{block.hasfinal}
+        </if>
+        <if test="block.hasfinal!=null and block.finalreason!=0">
+           ,finalreason=#{block.finalreason}
+        </if>
+        where mblockid=#{block.mblockid} and studentid=#{block.studentid} and mptqid in
+        <foreach collection="list" item="q" separator="," open="(" close=")">#{q.mptqid}</foreach>
+    </update>
 
     <!--扫描记录-查看原卷-客观题保存-获取学生答案-->
     <select id="listStuQuestionsByMspidAnbBlockid" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion">