按班级批阅、常用给分设置完善

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

@@ -26,11 +26,11 @@ public class MsPaperCheckTeacherScoresetService {
      **/
     public void add(MsPaperCheckTeacherScoreset set) {
         MsPaperCheckTeacherScoreset scoreset = msPaperCheckTeacherScoresetMapper.findByExamIdAndTeacherId(set.getExamid(), set.getTeacherid());
+        set.setCreatetime(N_Utils.getSecondTimestamp());
         if (scoreset != null) {
             set.setMpctsid(scoreset.getMpctsid());
-            msPaperCheckTeacherScoresetMapper.updateByPrimaryKeySelective(set);
+            msPaperCheckTeacherScoresetMapper.updateByPrimaryKey(set);
         } else {
-            set.setCreatetime(N_Utils.getSecondTimestamp());
             msPaperCheckTeacherScoresetMapper.insert(set);
         }
     }

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

@@ -397,6 +397,7 @@ public class MsPaperCheckTeacherTaskService {
         String checkscore;
         //仲裁状态0默认1待仲裁2已仲裁
         Integer arbitratestate = null;
+        param.setCorrecttype(correcttype);
         MsCheckVo result = msPaperCheckTeacherTaskMapper.getCheckResult(param);
         Integer mpsid = result.getMpsid();
         String stumerge = param.getStumerge();
@@ -410,7 +411,10 @@ public class MsPaperCheckTeacherTaskService {
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
                 block.setChecked(checked);
+                block.setFirstcid(handleid);
                 block.setFirstcime(N_Utils.getSecondTimestamp());
+                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergestuscore).collect(Collectors.joining(";"));
+                block.setFirstccores(stuscores);
                 block.setFirstccore(arbitratescore);
                 block.setHasgood(hasgood);
                 block.setHasbad(hasbad);
@@ -435,21 +439,11 @@ public class MsPaperCheckTeacherTaskService {
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
                         String[] mergestuscore = question.getMergestuscore().split(",");
-                        double[] scores = new double[mergestuscore.length];
-                        int last = mergestuscore.length - 1;
-                        double score = 0;
-                        for (int i = 0; i < mergestuscore.length; i++) {
-                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergestuscore[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]);
+                            studentQuestion.setFirstccore(MarkingUtil.objToDouble(mergestuscore[i]));
+                            studentQuestion.setStuscore(MarkingUtil.objToDouble(mergestuscore[i]));
                             studentQuestions.add(studentQuestion);
                         }
                     }
@@ -460,6 +454,7 @@ public class MsPaperCheckTeacherTaskService {
                 MsPaperStudentQuestion question = new MsPaperStudentQuestion();
                 question.setMpsqid(mpsbid);
                 question.setChecked(checked);
+                question.setFirstcid(handleid);
                 question.setFirstcime(N_Utils.getSecondTimestamp());
                 question.setFirstccore(arbitratescore);
                 question.setHasgood(hasgood);
@@ -514,11 +509,13 @@ public class MsPaperCheckTeacherTaskService {
                 String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
                 String[] cores;
                 if (type.equals(1)) {
+                    block.setFirstcid(handleid);
                     block.setFirstcime(N_Utils.getSecondTimestamp());
                     block.setFirstccore(arbitratescore);
                     block.setFirstccores(stuscores);
                     cores = param.getSecondcscores().split(";");
                 } else {
+                    block.setSecondcid(handleid);
                     block.setSecondctime(N_Utils.getSecondTimestamp());
                     block.setSecondcscore(arbitratescore);
                     block.setSecondcscores(stuscores);
@@ -617,9 +614,11 @@ public class MsPaperCheckTeacherTaskService {
                 question.setChecked(checked);
                 checkscore = arbitratescore.toString();
                 if (type.equals(1)) {
+                    question.setFirstcid(handleid);
                     question.setFirstcime(N_Utils.getSecondTimestamp());
                     question.setFirstccore(arbitratescore);
                 } else {
+                    question.setSecondcid(handleid);
                     question.setSecondctime(N_Utils.getSecondTimestamp());
                     question.setSecondcscore(arbitratescore);
                 }

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

@@ -397,7 +397,7 @@
             from ms_paper_student_block psq inner join ms_paper_check_teacher_task pctt on psq.mpsbid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
-            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            order by psq.mpsbid,field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
@@ -414,7 +414,7 @@
             </if>
             )))
             and psq.hasproblem=0
-            order by field(psq.checked,2,1,3)
+            order by psq.mpsbid,field(psq.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -533,7 +533,7 @@
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
-            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            order by psq.mptqid,field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
@@ -550,7 +550,7 @@
             </if>
             )))
             and psq.hasproblem=0
-            order by field(psq.checked,2,1,3)
+            order by psq.mptqid,field(psq.checked,2,1,3)
             limit 1
         </if>
     </select>
@@ -582,7 +582,7 @@
             <if test="param.mptqid!=null and param.mptqid!=0">
                 and psq.mptqid=#{param.mptqid}
             </if>
-            order by field(pctt.checkstate,2,1,3),pctt.taskorder
+            order by psq.mptqid,field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
@@ -603,7 +603,7 @@
             <if test="param.mptqid!=null and param.mptqid!=0">
                 and psq.mptqid=#{param.mptqid}
             </if>
-            order by field(psq.checked,2,1,3),psq.mptqid
+            order by psq.mptqid,field(psq.checked,2,1,3),psq.mptqid
             limit 1
         </if>
     </select>

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

@@ -139,7 +139,7 @@
     </update>
     <!--更新学生单题批阅信息-->
     <update id="checkByMptqidAndStudentId">
-        update ms_paper_student_question set checked=#{block.checked}
+        update ms_paper_student_question set
         <trim prefix="stuscore = case mptqid" suffix="end,">
             <foreach collection="list" item="q" separator=" ">
                 when #{q.mptqid} then ifnull(#{q.stuscore},stuscore)
@@ -151,11 +151,7 @@
                    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>
+            firstcid=#{block.firstcid},firstcime=#{block.firstcime}
         </if>
         <if test="block.secondctime!=null and block.secondctime!=0">
             <trim prefix="secondcscore = case mptqid" suffix="end,">
@@ -163,11 +159,7 @@
                     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>
+            secondcid=#{block.secondcid},secondctime=#{block.secondctime}
         </if>
         <if test="block.arbitrateid!=null and block.arbitrateid!=0">
             ,arbitrateid=#{block.arbitrateid}