批阅、仲裁、处理疑难卷更新学生得分

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

@@ -51,4 +51,7 @@ public interface MsPaperCheckTeacherProblemMapper extends TkMapper<MsPaperCheckT
 
     //处理疑难卷
     void correct(@Param("param") MsPaperCheckVo param);
+
+    //根据题块/试题id获取学生试卷id
+    Integer getMpsIdByMpsbid(@Param("mpsbid") Integer mpsbid,@Param("correcttype") Integer correcttype);
 }

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

@@ -8,6 +8,7 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentScore;
 import com.xhkjedu.smarking.vo.exam.CStudentVo;
 import com.xhkjedu.smarking.vo.stupaper.PaperStuExamVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.scheduling.annotation.Async;
 
 import java.util.List;
 import java.util.Map;
@@ -83,4 +84,8 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
 
     //删除考试学生信息
     void deleteByExamId(@Param("examid") Integer examid);
+
+    @Async("asyncPoolTaskExecutor")
+    //更新学生总分
+    void updateStudentPaperScoreByMpsId(@Param("mpsid") Integer mpsid);
 }

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

@@ -146,10 +146,8 @@ public class MsPaperCheckService {
 
     //设置一个题块的批卷任务
     public void setBlockTask(Integer mpid, Integer mblockid) {
-        new Thread(() -> {
-            MsPaperCheck check = msPaperCheckMapper.findByMBlockId(mpid, mblockid);
-            msBlockCheckService.setOneBlockTask(check);//设置一个题块的批卷任务
-        }).start();
+        MsPaperCheck check = msPaperCheckMapper.findByMBlockId(mpid, mblockid);
+        msBlockCheckService.setOneBlockTask(check);//设置一个题块的批卷任务
     }
 
     /**
@@ -218,7 +216,7 @@ public class MsPaperCheckService {
             tasks.add(task);
         }
         tasknum = taskIds.size();
-        msPaperCheckTeacherTaskMapper.batchUpdate(tasks);//批量更新任务信息
+        if(N_Utils.isListNotEmpty(tasks)) msPaperCheckTeacherTaskMapper.batchUpdate(tasks);//批量更新任务信息
         msPaperCheckTeacherMapper.updateTaskNum(mblockid, teacherid, tasknum, addTeacherId);//更新批阅教师任务数量
         return taskorder;
     }

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

@@ -3,8 +3,7 @@ package com.xhkjedu.smarking.service.papercheck;
 import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherArbitrateMapper;
-import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
-import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
+import com.xhkjedu.smarking.mapper.stupaper.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher;
@@ -37,6 +36,8 @@ public class MsPaperCheckTeacherArbitrateService {
     private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
     @Resource
     private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
     /**
      * @Description 教师阅卷-待/已仲裁列表
@@ -143,8 +144,10 @@ public class MsPaperCheckTeacherArbitrateService {
         Integer finalreason = param.getFinalreason();
         Integer hasgood = param.getHasgood();
         Integer hasbad = param.getHasbad();
+        Integer mpsid;
         if (correcttype.equals(3)) {//按题块批阅
             MsPaperStudentBlock block = msPaperStudentBlockMapper.selectByPrimaryKey(mpsbid);
+            mpsid = block.getMpsid();
             String firstccores = block.getFirstccores();
             String secondcscores = block.getSecondcscores();
             Double firstccore = block.getFirstccore();
@@ -223,8 +226,9 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setHasbad(hasbad);
             msPaperStudentBlockMapper.updateByPrimaryKeySelective(psq);
             msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, psq);
-        } else if (correcttype.equals(2)) {
+        } else {
             MsPaperStudentQuestion question = msPaperStudentQuestionMapper.selectByPrimaryKey(mpsbid);
+            mpsid = question.getMpsid();
             Double firstccore = question.getFirstccore();
             Double secondcscore = question.getSecondcscore();
             double scoreDiff1 = MarkingUtil.scoreDiff(firstccore, arbitratescore);
@@ -259,6 +263,8 @@ public class MsPaperCheckTeacherArbitrateService {
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
         msPaperCheckTeacherArbitrateMapper.correct(param);
+
+        msPaperStudentMapper.updateStudentPaperScoreByMpsId(mpsid);//更新学生总分
     }
 
     /**

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

@@ -3,8 +3,7 @@ package com.xhkjedu.smarking.service.papercheck;
 import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherProblemMapper;
-import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
-import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
+import com.xhkjedu.smarking.mapper.stupaper.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
 import com.xhkjedu.smarking.model.papercheck.*;
@@ -36,6 +35,8 @@ public class MsPaperCheckTeacherProblemService {
     private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
     @Resource
     private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
     /**
      * @Description 学科组长-疑难卷列表
@@ -179,6 +180,9 @@ public class MsPaperCheckTeacherProblemService {
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
         msPaperCheckTeacherProblemMapper.correct(param);
+
+        Integer mpsid = msPaperCheckTeacherProblemMapper.getMpsIdByMpsbid(mpsbid, correcttype);
+        msPaperStudentMapper.updateStudentPaperScoreByMpsId(mpsid);//更新学生总分
     }
 
     /**

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

@@ -4,8 +4,7 @@ import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
 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.stupaper.*;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
@@ -43,6 +42,8 @@ public class MsPaperCheckTeacherTaskService {
     private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
     @Resource
     private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
 
 
     /**
@@ -396,6 +397,8 @@ public class MsPaperCheckTeacherTaskService {
         String checkscore;
         //仲裁状态0默认1待仲裁2已仲裁
         Integer arbitratestate = null;
+        MsCheckVo result = msPaperCheckTeacherTaskMapper.getCheckResult(param);
+        Integer mpsid = result.getMpsid();
         if (checktype.equals(1)) {//单评
             if (hasproblem.equals(0)) {
                 checked = 3;
@@ -415,7 +418,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setProblemcomm(problemcomm);
                 block.setProbleid(probleid);
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
-                block.setStudentid(param.getStudentid());
+                block.setMpsid(mpsid);
                 block.setMblockid(param.getMblockid());
 
                 List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
@@ -467,7 +470,6 @@ public class MsPaperCheckTeacherTaskService {
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         } else {//双评
-            MsCheckVo result = msPaperCheckTeacherTaskMapper.getCheckResult(param);
             Integer firstcime = result.getFirstcime();
             Integer secondcime = result.getSecondctime();
             Double firstccore = result.getFirstccore();
@@ -599,7 +601,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setProblemtype(problemtype);
                 block.setProblemcomm(problemcomm);
                 block.setProbleid(probleid);
-                block.setStudentid(param.getStudentid());
+                block.setMpsid(mpsid);
                 block.setMblockid(param.getMblockid());
                 block.setArbitratestate(arbitratestate);
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
@@ -634,6 +636,8 @@ public class MsPaperCheckTeacherTaskService {
         param.setProblemcomm(problemcomm);
         param.setCheckscore(checkscore);
         msPaperCheckTeacherTaskMapper.correct(param);
+
+        if (checked == 3) msPaperStudentMapper.updateStudentPaperScoreByMpsId(mpsid);//更新学生总分
     }
 
     //最终得分计算

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

@@ -9,6 +9,8 @@ import lombok.Data;
  **/
 @Data
 public class MsCheckVo {
+    //试卷学生id
+    private Integer mpsid;
     //单评批改人
     private Integer firstcid;
     //单评批改时间

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

@@ -171,4 +171,13 @@
         </if>
         where pctt.mpid=#{param.mpid} and pctt.mpsbid=#{param.mpsbid}
     </select>
+    <!--根据题块/试题id获取学生试卷id-->
+    <select id="getMpsIdByMpsbid" resultType="java.lang.Integer">
+        <if test="param.correcttype==3">
+            select mpsid from ms_paper_student_block where mpsbid=#{mpsbid}
+        </if>
+        <if test="param.correcttype!=3">
+            select mpsid from ms_paper_student_question where mpsqid=#{mpsbid}
+        </if>
+    </select>
 </mapper>

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

@@ -64,7 +64,7 @@
     <select id="getTaskIdsByMBlockIdAndTeacherId" resultType="java.lang.Integer">
         select mpcttid
         from ms_paper_check_teacher_task
-        where mblockid = #{mblockId} and teacherid = #{teacherId} and checkstate != 3
+        where mblockid = #{mblockid} and teacherid = #{teacherid} and checkstate != 3
         order by taskorder desc limit #{tasknum}
     </select>
     <!--阅卷进度-按题块-->
@@ -704,6 +704,7 @@
     <!--获取批阅结果-->
     <select id="getCheckResult" resultType="com.xhkjedu.smarking.vo.papercheck.MsCheckVo">
         select psq.firstcid,psq.firstcime,psq.firstccore,psq.firstccores,psq.secondcid,psq.secondctime,psq.secondcscore,psq.secondcscores
+        ,psq.mpsid
         <if test="param.correcttype==3">
             from ms_paper_student_block psq
             where psq.mpsbid=#{param.mpsbid}

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

@@ -8,7 +8,7 @@
         on b.mpsid=q.mpsid and b.mblockid=q.mblockid
         set b.stuanswer=null,b.converted=0,b.checked=0,b.hasgood=0,b.hasbad=0,b.firstcid=null,b.firstcime=null,b.firstccore=0,
             b.secondcid=null,b.secondctime=null,b.secondcscore=0,b.arbitrateid=null,b.arbitratetime=null,b.arbitratescore=0,
-            b.hasproblem=0,b.problemtype=0,b.problemcomm=null,,b.hasfinal=0,b.finalreason=0,
+            b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasfinal=0,b.finalreason=0,
             q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
             q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,
             q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
@@ -21,7 +21,7 @@
         on b.mpsid=q.mpsid and b.mblockid=q.mblockid
             set b.stuanswer=null,b.converted=0,b.checked=0,b.hasgood=0,b.hasbad=0,b.firstcid=null,b.firstcime=null,b.firstccore=0,
                 b.secondcid=null,b.secondctime=null,b.secondcscore=0,b.arbitrateid=null,b.arbitratetime=null,b.arbitratescore=0,
-                b.hasproblem=0,b.problemtype=0,b.problemcomm=null,,b.hasfinal=0,b.finalreason=0,
+                b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasfinal=0,b.finalreason=0,
                 q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
                 q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,
                 q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
@@ -53,12 +53,12 @@
         </collection>
     </resultMap>
     <select id="listPaperStuBlockQuestions" resultMap="stuBlockQuestions">
-        select distinct b.mpsbid,b.mpsid,b.mpid,b.mblockid,b.stuanswer,pb.blocktype,q.mpsqid,q.mpsid,q.mptqid,q.qn,q.qorder,
+        select distinct b.mpsbid,b.mpsid,b.mpid,b.mblockid,b.stuanswer,pb.blocktype,q.mpsqid,q.mptqid,q.qn,q.qorder,
                         q.qscore,q.ctype,tq.qanswer,tq.loseoption,tq.scoreset,p.answered
         from ms_paper_student_question q left join ms_paper_student_block b
-        on b.mpsid=q.mpsid and b.mpsbid=q.mpsbid
+        on b.mpsid=q.mpsid and b.mblockid=q.mblockid
         left join ms_paper_block pb on pb.mblockid=b.mblockid
-        left join ms_paper_block_question pbq on q.mbqid=pbq.mbqid
+        left join ms_paper_block_question pbq on q.mptqid=pbq.mptqid
         left join ms_paper_qtype_question tq on pbq.mptqid=tq.mptqid
         left join ms_paper p on p.mpid=b.mpid
         where b.mpsid = #{mpsid}
@@ -75,18 +75,18 @@
         update ms_paper_student_block
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="firstcid = case mpsbid" suffix="end,">
-                <foreach collection="merges" item="m" separator="when">
-                    ${m.mpsbid} then ifnull(${m.firstcid},firstcid)
+                <foreach collection="list" item="m" separator=" ">
+                    when #{m.mpsbid} then ifnull(#{m.firstcid},firstcid)
                 </foreach>
             </trim>
             <trim prefix="secondcid = case mpsbid" suffix="end,">
-                <foreach collection="merges" item="m" separator="when">
-                    ${m.mpsbid} then ifnull(${m.secondcid},secondcid)
+                <foreach collection="list" item="m" separator=" ">
+                    when #{m.mpsbid} then ifnull(#{m.secondcid},secondcid)
                 </foreach>
             </trim>
         </trim>
         where mpsbid in
-        <foreach collection="merges" item="m" open="(" separator="," close=")">
+        <foreach collection="list" item="m" open="(" separator="," close=")">
             #{m.mpsbid}
         </foreach>
     </update>

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

@@ -269,5 +269,10 @@
     <update id="updateStuScoreForRestoreFillScore">
         update ms_paper_student set stuscore=0.0,stuscoretype=0 where examid=#{examid} and studentid=#{studentid}
     </update>
+    <!--更新学生总分-->
+    <update id="updateStudentPaperScoreByMpsId">
+        update ms_paper_student set stuscore=(select sum(ifnull(q.stuscore,0)) from ms_paper_student_question q where q.mpsid=#{mpsid})
+        where mpsid=#{mpsid}
+    </update>
 
 </mapper>

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

@@ -93,13 +93,13 @@
         update ms_paper_student_question
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="firstcid = case mpsqid" suffix="end,">
-                <foreach collection="list" item="m" separator="when">
-                    ${m.mpsbid} then ifnull(${m.firstcid},firstcid)
+                <foreach collection="list" item="m" separator=" ">
+                    when #{m.mpsbid} then ifnull(#{m.firstcid},firstcid)
                 </foreach>
             </trim>
             <trim prefix="secondcid = case mpsqid" suffix="end,">
-                <foreach collection="list" item="m" separator="when">
-                    ${m.mpsbid} then ifnull(${m.secondcid},secondcid)
+                <foreach collection="list" item="m" separator=" ">
+                    when #{m.mpsbid} then ifnull(#{m.secondcid},secondcid)
                 </foreach>
             </trim>
         </trim>
@@ -208,7 +208,7 @@
         <if test="block.checked!=null and block.checked!=0">
             ,checked=#{block.checked}
         </if>
-        where mblockid=#{block.mblockid} and studentid=#{block.studentid} and mptqid in
+        where mblockid=#{block.mblockid} and mpsid=#{block.mpsid} and mptqid in
         <foreach collection="list" item="q" separator="," open="(" close=")">#{q.mptqid}</foreach>
     </update>