完善小题分析

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQuestion.java

@@ -36,6 +36,15 @@ public class ERclassQuestion extends BaseBean {
     //试题排序
     private Integer qorder;
 
+    //分值
+    private Double score;
+
+    //难易度
+    private Integer complexity;
+
+    //题型名称
+    private String qtypename;
+
     //班级得分
     private Double classscore;
 

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -14,7 +14,6 @@ import com.xhkjedu.sexam.vo.paper.*;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -266,6 +265,7 @@ public class EPaperQtypeService {
                         mq.setComplexity(qobj.getMcomplexity());
                         mq.setQorder(qobj.getQorder());
                         mq.setScore(score);
+                        mq.setQtypename(qobj.getMqtypename());
                         if(k == 0){
                             mq.setMctype(111);
                         }else{
@@ -293,9 +293,9 @@ public class EPaperQtypeService {
 
             //试题题型分析数据
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
-            Map tmap = new HashMap();
-            tmap.put("qtname",qt.getEptname());
+            Map tmap = new TreeMap();
             tmap.put("qtid",qt.getEptid());
+            tmap.put("qtname",qt.getEptname());
             tmap.put("num",qt.getEptnum());
             tmap.put("score",qt.getEptscore());
             tmap.put("srate",storerate);
@@ -325,7 +325,7 @@ public class EPaperQtypeService {
         zgq.setScore(N_Utils.getDoubleReduce(ePaper.getPscore(),ktscore));
         zgq.setSrate(N_Utils.getDoubleReduce(100.0,ktsrate));
         ranglist.add(zgq);
-        Map ztmap = new HashMap<>();
+        Map ztmap = new TreeMap<>();
         ztmap.put("pnum", ePaper.getPnum());
         ztmap.put("pscore",ePaper.getPscore());
         ztmap.put("ranglist",ranglist);
@@ -338,7 +338,7 @@ public class EPaperQtypeService {
                 List<QuestionOrderVo> pgblist = entry.getValue();
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
-                Map prate = new HashMap();
+                Map prate = new TreeMap();
                 prate.put("level",Integer.parseInt(entry.getKey()));
                 prate.put("score",score);
                 prate.put("srate",srate);
@@ -357,7 +357,7 @@ public class EPaperQtypeService {
                 //获取知识点的总分
                 Double score = pgblist.stream().mapToDouble(s -> s.getScore()).sum();
                 Double srate = N_Utils.getDoubleDivideAndMulitiply(score,ePaper.getPscore());
-                Map prate = new HashMap();
+                Map prate = new TreeMap();
                 prate.put("pointid",entry.getKey());
                 prate.put("pointname",pgblist.get(0).getName());
                 prate.put("score",score);
@@ -518,6 +518,7 @@ public class EPaperQtypeService {
         QuestionOrderVo qtype = new QuestionOrderVo();
         qtype.setId(dq.getQtypeid());
         qtype.setName(dq.getQtypename());
+        qtype.setComplexity(dq.getComplexity());
         qtype.setOrder(dq.getQorder());
         qtype.setScore(dq.getScore());
         qtype.setQlevel(dq.getQlevel());
@@ -584,14 +585,14 @@ public class EPaperQtypeService {
         double kscorerate = N_Utils.getDoubleReduce(100.0,zscorerate);
 
         List<Map> ranglist = new ArrayList<>();
-        Map zgmap = new HashMap();
+        Map zgmap = new TreeMap();
         zgmap.put("qtname","主观题");
         zgmap.put("score",zscore);
         zgmap.put("num",znum);
         zgmap.put("srate",zscorerate);
         zgmap.put("nrate",znumrate);
         ranglist.add(zgmap);
-        Map kgmap = new HashMap();
+        Map kgmap = new TreeMap();
         kgmap.put("qtname","客观题");
         kgmap.put("score",kscore);
         kgmap.put("num",knum);
@@ -599,7 +600,7 @@ public class EPaperQtypeService {
         kgmap.put("nrate",knumrate);
         ranglist.add(kgmap);
 
-        Map ztmap = new HashMap<>();
+        Map ztmap = new TreeMap<>();
         ztmap.put("pnum", ePaper.getPnum());
         ztmap.put("pscore",ePaper.getPscore());
         ztmap.put("ranglist",ranglist);
@@ -618,22 +619,27 @@ public class EPaperQtypeService {
             List<Integer> orderlist = new ArrayList<>();
             List<Integer> eptqidlist = new ArrayList<>();
             List<String> qnlist = new ArrayList<>();
-
+            List<Double> scorelist = new ArrayList<>();
+            List<String> qnamelist = new ArrayList<>();
             for(EPaperQtype t : aq){
                 List<EPaperQtypeQuestion> qlist = t.getQuestions();
                 for(EPaperQtypeQuestion q : qlist){
                     orderlist.add(q.getQorder());
                     eptqidlist.add(q.getId());
                     qnlist.add(q.getQn());
+                    scorelist.add(q.getScore());
+                    qnamelist.add(q.getQtypename());
                 }
             }
 
-            Map anmap = new HashMap();//题型对应试题的id和基础信息
+            Map anmap = new TreeMap();//题型对应试题的id和基础信息
             anmap.put("orders",orderlist);
             anmap.put("eptqids",eptqidlist);
             anmap.put("qns",qnlist);
+            anmap.put("scores",scorelist);
+            anmap.put("qtypenames",qnamelist);
 
-            Map tmap = new HashMap();
+            Map tmap = new TreeMap();
             tmap.put("qtname",entry.getKey());
             tmap.put("qtid",aq.get(0).getEptid());
             tmap.put("num",num);

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

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -1749,6 +1750,11 @@ public class EReportGenerateService {
             List<Integer> eptqids = (List<Integer>) ques.get("eptqids");//试卷中题型下试题id
             List<String> qns = (List<String>) ques.get("qns");//试卷中试题题号
             List<Integer> orders = (List<Integer>) ques.get("orders");//试卷中试题题号
+            List<String> qtypenames = (List<String>) ques.get("qtypenames");
+            List<Object> scoresObj = (List<Object>) ques.get("scores");
+            List<Double> scores  = scoresObj.stream().map((d) -> {
+                return Double.valueOf(d + "");
+            }).collect(Collectors.toList());
 
             Double tgstuscore = 0.0;//题型下学生得分
             Double tgscore = 0.0;//题型下试题总分
@@ -1789,6 +1795,8 @@ public class EReportGenerateService {
                     ercq.setEptqid(eptqid);
                     ercq.setQn(qns.get(q));
                     ercq.setQorder(orders.get(q));
+                    ercq.setScore(scores.get(q));
+                    ercq.setQtypename(qtypenames.get(q));
                     ercq.setClassscore(qcstuscore);
                     ercq.setClassmaxscore(qcmaxstu.getStuscore());
                     ercq.setClassavgscore(qcavgscore);
@@ -1904,6 +1912,9 @@ public class EReportGenerateService {
                 String order = quesmap.get("order").toString();//试题母题题号
                 String questionid = quesmap.get("questionid").toString();
                 List<String> qnslist = (List<String>) quesmap.get("qns");
+                String quesname = quesmap.get("name").toString();
+                Integer complexity = Integer.parseInt(quesmap.get("complexity").toString());
+                Double quesscore = Double.parseDouble(quesmap.get("score").toString());
                 qns = qns + order + ",";
 
                 //获取集合中对应子题集合的数据
@@ -1999,6 +2010,9 @@ public class EReportGenerateService {
                     ercq.setEpid(examPaperClassVo.getEpid());
                     ercq.setEptqid(eptqid);
                     ercq.setQuestionid(questionid);
+                    ercq.setQtypename(quesname);
+                    ercq.setComplexity(complexity);
+                    ercq.setScore(quesscore);
                     ercq.setQn(String.join(",", qnslist));
                     ercq.setQorder(Integer.parseInt(order));
                     ercq.setClassscore(qcstuscore);

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

@@ -156,15 +156,22 @@ public class EReportStudentService {
      * @Date 2022/8/25 16:54
      **/
     public List<Map> listSubjectQuestions(Integer examid, Integer studentid, String subjectid) {
-        List<Map> list = eRstudentMapper.listSubjectQuestions(examid, studentid, subjectid);
-        Double paperscore = list.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
-        for (Map m : list) {
-            Double stuscore = Double.parseDouble(m.get("stuscore").toString());
-            Double qscore = Double.parseDouble(m.get("qscore").toString());
-            Double stusrate = N_Utils.getDoubleDivideAndMulitiply(stuscore, qscore);
-            m.put("stusrate", stusrate);
-            Double srate = N_Utils.getDoubleDivideAndMulitiply(qscore, paperscore);
-            m.put("srate", srate);
+        Map map = ePaperMapper.getPaperByExamidAndSubjectid(examid, subjectid);
+        Integer ptype = Integer.parseInt(map.get("ptype").toString());
+        List<Map> list = new ArrayList<>();
+        if(ptype == 1){
+
+        }else{
+            list = eRstudentMapper.listSubjectQuestions(examid, studentid, subjectid);
+            Double paperscore = list.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
+            for (Map m : list) {
+                Double stuscore = Double.parseDouble(m.get("stuscore").toString());
+                Double qscore = Double.parseDouble(m.get("qscore").toString());
+                Double stusrate = N_Utils.getDoubleDivideAndMulitiply(stuscore, qscore);
+                m.put("stusrate", stusrate);
+                Double srate = N_Utils.getDoubleDivideAndMulitiply(qscore, paperscore);
+                m.put("srate", srate);
+            }
         }
         return list;
     }

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/QuestionOrderVo.java

@@ -14,6 +14,8 @@ public class QuestionOrderVo {
 
     private String name;
 
+    private Integer complexity;
+
     //试题类型1单题2母题
     private Integer qlevel;
 

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -18,7 +18,7 @@ class SexamApplicationTests {
 
     @Test
     void contextLoads() {
-//        eReportGenerateService.saveClassQuestions(2);
+        eReportGenerateService.saveClassQuestions(2);
 //        EPaper epaper = new EPaper();
 //        epaper.setEpid(6);
 //        epaper.setPnum(12);