试卷错题集计算得分率

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -180,8 +180,14 @@ public class EReportStudentService {
         List<Map> list = null;
         if (ptype == 1) {
             list = eRstudentMapper.listStudentQuestionsTk(epid, studentid);
+            setPaperQuestionForTK(list);
         } else {
             list = eRstudentMapper.listStudentQuestionsFj(epid, studentid);
+            for(Map qmap : list){
+                Double stuscore = Double.parseDouble(qmap.get("stuscore").toString());
+                Double pscore = Double .parseDouble(qmap.get("qscore").toString());
+                qmap.put("srate",N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore));
+            }
             List<Map> files = ePaperFileMapper.listPaperFiles(epid);
             map.put("files", files);
         }
@@ -203,8 +209,10 @@ public class EReportStudentService {
                 map.put("ctype", Integer.parseInt(q.get("ctype").toString()));
                 map.put("qn", q.get("qn").toString());
                 map.put("qorder", Integer.parseInt(q.get("qorder").toString()));
-                map.put("qscore", Double.parseDouble(q.get("qscore").toString()));
-                map.put("stuscore", Double.parseDouble(q.get("stuscore").toString()));
+                Double stuscore = Double.parseDouble(q.get("qscore").toString());
+                Double pscore = Double .parseDouble(map.get("qscore").toString());
+                map.put("qscore", pscore);
+                map.put("stuscore", stuscore);
                 map.put("answered", Integer.parseInt(q.get("answered").toString()));
                 map.put("answertype", Integer.parseInt(q.get("answertype").toString()));
                 map.put("stuanswer", q.get("stuanswer").toString());
@@ -231,6 +239,8 @@ public class EReportStudentService {
                 map.put("qlevel", qlevel);
                 map.put("classavgscore", Double.parseDouble(q.get("classavgscore").toString()));
                 map.put("gradeavgscore", Double.parseDouble(q.get("gradeavgscore").toString()));
+                map.put("srate",N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore));//得分率
+
                 if (q.get("points") != null) {
                     List<Map> points = (List<Map>) q.get("points");
                     map.put("points", points);
@@ -249,7 +259,6 @@ public class EReportStudentService {
                     mq.put("qorder", Integer.parseInt(q.get("qorder").toString()));
                     mq.put("ctype", Integer.parseInt(q.get("mctype").toString()));
                     mq.put("qstem", q.get("mqstem").toString());
-                    mq.put("qoption", q.get("mqoption").toString());
                     if(N_Utils.isNotEmpty(q.get("mqoption"))){
                         mq.put("qoption", q.get("mqoption").toString());
                     }else{
@@ -275,6 +284,11 @@ public class EReportStudentService {
                         List<Map> points = (List<Map>) q.get("points");
                         mq.put("points", points);
                     }
+
+                    Double stuscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("stuscore").toString())).sum();
+                    Double pscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("pscore").toString())).sum();
+                    mq.put("srate",N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore));
+
                     mq.put("sonques", sonqueslist);
                     rtnlist.add(mq);
                 }
@@ -362,7 +376,14 @@ public class EReportStudentService {
      * @Date 2022/8/29 16:15
      **/
     public List<Map> listStudentErrorQuestionsFj(Integer examid, Integer studentid,String subjectid){
-        return eRstudentMapper.listStudentErrorQuestionsForFj(examid,studentid,subjectid);
+        List<Map> list = eRstudentMapper.listStudentErrorQuestionsForFj(examid,studentid,subjectid);
+        for(Map map : list){
+            Double stuscore = Double.parseDouble(map.get("stuscore").toString());
+            Double pscore = Double .parseDouble(map.get("qscore").toString());
+            Double srate = N_Utils.getDoubleDivideAndMulitiply(stuscore,pscore);
+            map.put("srate",srate);
+        }
+        return list;
     }
 
 }