题块批阅、进度总览完善

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

@@ -406,14 +406,14 @@ public class MsPaperCheckTeacherTaskService {
                 checked = 3;
             }
             if (correcttype.equals(3)) {//按题块批阅
-                checkscore = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
+                checkscore = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 //题块批阅信息
                 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(";"));
+                String stuscores = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 block.setFirstccores(stuscores);
                 block.setFirstccore(arbitratescore);
                 block.setHasgood(hasgood);
@@ -438,12 +438,13 @@ public class MsPaperCheckTeacherTaskService {
                         studentQuestions.add(studentQuestion);
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
-                        String[] mergestuscore = question.getMergestuscore().split(",");
+                        String[] mergescores = question.getMergescore().split(",");
+                        double[] scores = setStuScore(mergescores, stuscore);//计算学生小题得分
                         for (int i = 0; i < mptqids.length; i++) {
                             MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
                             studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));
-                            studentQuestion.setFirstccore(MarkingUtil.objToDouble(mergestuscore[i]));
-                            studentQuestion.setStuscore(MarkingUtil.objToDouble(mergestuscore[i]));
+                            studentQuestion.setFirstccore(scores[i]);
+                            studentQuestion.setStuscore(scores[i]);
                             studentQuestions.add(studentQuestion);
                         }
                     }
@@ -506,7 +507,7 @@ public class MsPaperCheckTeacherTaskService {
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
                 block.setMpsbid(mpsbid);
-                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergestuscore).collect(Collectors.joining(";"));
+                String stuscores = questions.stream().map(q -> q.getStuscore().toString()).collect(Collectors.joining(";"));
                 String[] cores = new String[0];
                 if (type.equals(1)) {
                     block.setFirstcid(handleid);
@@ -553,11 +554,7 @@ public class MsPaperCheckTeacherTaskService {
                     } else {
                         String[] mptqids = question.getMergeqid().split(",");
                         String[] mergescores = question.getMergescore().split(",");
-                        String[] mergestuscore = question.getMergestuscore().split(",");
-                        double[] scores = new double[mergestuscore.length];
-                        for (int i = 0; i < mergestuscore.length; i++) {
-                            scores[i]=MarkingUtil.objToDouble(mergestuscore[i]);
-                        }
+                        double[] scores = setStuScore(mergescores, stuscore);//计算学生小题得分
                         String[] cores2 = new String[0];
                         if (corrected) cores2 = cores[j].split(",");
                         for (int i = 0; i < mptqids.length; i++) {
@@ -639,6 +636,19 @@ public class MsPaperCheckTeacherTaskService {
         if (checked == 3) msPaperStudentMapper.updateStudentPaperScoreByMpsId(mpsid);//更新学生总分
     }
 
+    //计算学生小题得分
+    private double[] setStuScore(String[] mergescores, Double stuscore) {
+        double totalScore = 0;
+        for (String mergescore : mergescores) {
+            totalScore = MarkingUtil.add(mergescore, totalScore);
+        }
+        double[] scores = new double[mergescores.length];
+        for (int i = 0; i < mergescores.length; i++) {
+            scores[i] = MarkingUtil.mul(stuscore, MarkingUtil.div(mergescores[i], totalScore));
+        }
+        return scores;
+    }
+
     //最终得分计算
     private Double getUserScore(Integer finalscore, double addScore, Double roundvalue) {
         double score;

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

@@ -12,8 +12,8 @@
     <!--考试进度总览-->
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.msstate,s.pstate,s.ptstate,
-        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,p.cutstate,s.teacherid,
-        u.username as teachername,p.mpid,p.yjstate,p.cutstate,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
+        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,s.teacherid,
+        u.username as teachername,p.mpid,p.yjstate,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join t_user u2 on s.leaderid=u2.userid