Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERStudentQtype.java

@@ -0,0 +1,41 @@
+package com.xhkjedu.sexam.model.reportstu;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description考考试报告试卷学生题型分析表
+ * @Author WN
+ * Date 2022/8/15 14:10
+ **/
+@Table(name = "e_rstudent_qtype")
+@Data
+public class ERStudentQtype extends BaseBean {
+    @Id
+    //考试报告试卷学生题型分析表
+    private Integer erstid;
+
+    //考试id
+    private Integer examid;
+
+    //科目id
+    private Integer subjectid;
+
+    //学生id
+    private Integer studentid;
+
+    //班级id
+    private Integer classid;
+
+    //题型名称
+    private String qtypename;
+
+    //学生得分
+    private Double stuscore;
+
+    //学生得分率
+    private Double stusrate;
+}

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERstudentPoint.java

@@ -31,7 +31,7 @@ public class ERstudentPoint extends BaseBean {
     //知识点名称
     private String pointname;
 
-    //知识点题号
+   /* //知识点题号
     private String qns;
 
     //知识点分值
@@ -39,14 +39,14 @@ public class ERstudentPoint extends BaseBean {
 
     //分值占比
     private Double srate;
-
+*/
     //学生得分
     private Double stuscore;
 
     //学生得分率
-    private Double sturate;
+    private Double stusrate;
 
-    //班级得分
+    /*//班级得分
     private Double classscore;
 
     //班级得分率
@@ -56,5 +56,5 @@ public class ERstudentPoint extends BaseBean {
     private Double gradescore;
 
     //年级得分率
-    private Double graderate;
+    private Double graderate;*/
 }

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

@@ -200,9 +200,10 @@ public class EPaperQtypeService {
         List<EPaperQPointVo> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
 
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
-        List<EPaperQsVo> typelist = new ArrayList<>();//题型分析
+        List<Map> typelist = new ArrayList<>();//题型分析
         //处理出试卷中所有试题、知识点
         for(EPaperQtypeVo qt : qtypelist){
+            List<Integer> qorderlist = new ArrayList<>();
             for(EPaperQtypeQuestionVo q : qt.getQuestions()){
                 //处理试题关联知识点
                 List<EPaperQPointVo> pointslist = q.getPoints();
@@ -221,15 +222,20 @@ public class EPaperQtypeService {
                     q.setQuestionpid("000");
                 }
                 queslist.add(q);
+                if(!qorderlist.contains(q.getQorder())){
+                    qorderlist.add(q.getQorder());
+                }
             }
 
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
             EPaperQsVo tvo = new EPaperQsVo();
-            tvo.setQtname(qt.getEptname());
-            tvo.setNum(qt.getEptnum());
-            tvo.setScore(qt.getEptscore());
-            tvo.setSrate(storerate);
-            typelist.add(tvo);
+            Map tmap = new HashMap();
+            tmap.put("qtname",qt.getEptname());
+            tmap.put("num",qt.getEptnum());
+            tmap.put("score",qt.getEptscore());
+            tmap.put("srate",storerate);
+            tmap.put("qns",qorderlist);
+            typelist.add(tmap);
         }
 
         //获取出所有单题和母题,进行判断区分
@@ -320,7 +326,7 @@ public class EPaperQtypeService {
             pm.put("pointname",pvo.get(0).getPointname());
             pm.put("score",cscore);
             pm.put("srate",scorerate);
-            pm.put("order",JSON.toJSONString(thlist));
+            pm.put("order",thlist);
             pointlist.add(pm);
         }
 
@@ -360,9 +366,21 @@ public class EPaperQtypeService {
         double zscorerate = N_Utils.getDoubleDivideAndMulitiply(zscore, ePaper.getPscore());
         double kscorerate = N_Utils.getDoubleReduce(100.0,zscorerate);
 
-        List<EPaperQsVo> ranglist = new ArrayList<>();
-        ranglist.add(new EPaperQsVo("主观题",zscore,znum,zscorerate,znumrate));
-        ranglist.add(new EPaperQsVo("客观题",kscore,knum,kscorerate,knumrate));
+        List<Map> ranglist = new ArrayList<>();
+        Map zgmap = new HashMap();
+        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();
+        kgmap.put("qtname","客观题");
+        kgmap.put("score","kscore");
+        kgmap.put("num","knum");
+        kgmap.put("srate","kscorerate");
+        kgmap.put("nrate","knumrate");
+        ranglist.add(kgmap);
 
         Map ztmap = new HashMap<>();
         ztmap.put("pnum", ePaper.getPnum());
@@ -372,18 +390,32 @@ public class EPaperQtypeService {
         //题型分布(按照名称进行分组)
         fjtypelist.stream().sorted(Comparator.comparing(EPaperQtype::getEptorder)).collect(Collectors.toList());
         Map<String,List<EPaperQtype>> qtypemap =  fjtypelist.stream().collect(Collectors.groupingBy(EPaperQtype:: getEptname, Collectors.toList()));
-        List<EPaperQsVo> qtlist = new ArrayList<>();
+        List<Map> qtlist = new ArrayList<>();
         for(Map.Entry<String, List<EPaperQtype>> entry : qtypemap.entrySet()){
             List<EPaperQtype> aq = entry.getValue();
             int num = aq.stream().mapToInt(EPaperQtype::getEptnum).sum();
             double tscore = aq.stream().collect(Collectors.summingDouble(EPaperQtype:: getEptscore));
             double storerate = N_Utils.getDoubleDivideAndMulitiply(tscore, ePaper.getPscore());
-            EPaperQsVo qvo = new EPaperQsVo();
-            qvo.setQtname(entry.getKey());
-            qvo.setNum(num);
-            qvo.setScore(tscore);
-            qvo.setSrate(storerate);
-            qtlist.add(qvo);
+            //获取小题题号
+
+            List<String> allqns = new ArrayList<>();
+            for(EPaperQtype t : aq){
+                List<EPaperQtypeQuestion> qlist = t.getQuestions();
+                List<String> qnlist = qlist.stream().map(EPaperQtypeQuestion :: getQn).collect(Collectors.toList());
+                for(String n : qnlist){
+                    if(!allqns.contains(n)){
+                        allqns.add(n);
+                    }
+                }
+            }
+
+            Map tmap = new HashMap();
+            tmap.put("qtname",entry.getKey());
+            tmap.put("num",num);
+            tmap.put("score",tscore);
+            tmap.put("srate",storerate);
+            tmap.put("qns",allqns);
+            qtlist.add(tmap);
         }
 
         EPaperAnalyze epa = new EPaperAnalyze();

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

@@ -21,7 +21,9 @@ import com.xhkjedu.sexam.model.reportclass.ERclass;
 import com.xhkjedu.sexam.model.reportclass.ERclassQtype;
 import com.xhkjedu.sexam.model.reportclass.ERclassQuestion;
 import com.xhkjedu.sexam.model.reportclass.ERclassQuestionPoint;
+import com.xhkjedu.sexam.model.reportstu.ERStudentQtype;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.model.reportstu.ERstudentPoint;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
 import com.xhkjedu.sexam.vo.paper.EPaperQtypeQuestionVo;
@@ -348,6 +350,8 @@ public class EReportGenerateService {
         List<ERclassQtype> rtypelist = new ArrayList<>();
         List<ERclassQuestion> rqlist = new ArrayList<>();
         List<ERclassQuestionPoint> rpointlist = new ArrayList<>();
+        List<ERStudentQtype> stuqtypes = new ArrayList<>();
+        List<ERstudentPoint> stupoints = new ArrayList<>();
 
         for(Map map : subjects){
             String subjectid = map.get("subjectid").toString();
@@ -362,6 +366,9 @@ public class EReportGenerateService {
                 fjtypelist = ePaperQtypeMapper.listPaperQtypeQuesitonsForFj(epid);//试卷题型试题信息（附件）
             }
 
+            //获取试卷只是分析
+            Map epa = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
+
             //遍及试卷处理题型下各班级得分情况
             for(EPaperQtypeVo t : fjtypelist){
                 Double eptscore = t.getEptscore();
@@ -465,8 +472,6 @@ public class EReportGenerateService {
 
             //仅有题库试卷有知识点
             if(ptype == 1){
-                //获取试卷只是分析
-                Map epa = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
                 String pointjson = epa.get("pointjson").toString();
                 List<Map> pointlist = JSON.parseArray(pointjson,Map.class);
                 //遍历知识点处理年级班级知识点情况
@@ -476,9 +481,8 @@ public class EReportGenerateService {
                     String pointname = pointmap.get("pointname").toString();
                     Double score = Double.parseDouble(pointmap.get("score").toString());
                     Double scorerate = Double.parseDouble(pointmap.get("scorerate").toString());
-                    String qnstr = pointmap.get("order").toString();
+                    List<Integer> qnlst = (List<Integer>) pointmap.get("order");//试题排序集合
 
-                    List<String> qnlst = JSON.parseArray(qnstr,String.class);//题号集合
                     List<EPaperStudentQuestion> gstus = stulist.stream().filter(o -> o.getEpid().equals(epid) && qnlst.contains(o.getQn())).collect(Collectors.toList());
                     Double gstuscore = gstus.stream().mapToDouble(EPaperStudentQuestion :: getStuscore).sum();
                     Double gscore = gstus.stream().mapToDouble(EPaperStudentQuestion :: getQscore).sum();
@@ -501,16 +505,14 @@ public class EReportGenerateService {
                         pointvo.setPointname(pointname);
                         pointvo.setScore(score);
                         pointvo.setSrate(scorerate);
-                        pointvo.setQns(qnstr);
+                        pointvo.setQns(qnlst.stream().map(String::valueOf).collect(Collectors.joining(",")));
                         pointvo.setGradeavgscore(gavgscore);
                         pointvo.setGradesrate(gsrate);
                         pointvo.setClassavgscore(cavgscore);
                         pointvo.setClasssrate(csrate);
                         rpointlist.add(pointvo);
                     }
-
                 }
-
             }
         }
         eRclassQtypeMapper.insertList(rtypelist);
@@ -657,4 +659,6 @@ public class EReportGenerateService {
         rtnmap.put("badlist",JSON.toJSONString(badlist));
         return rtnmap;
     }
+
+
 }

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

@@ -20,6 +20,8 @@ public class EPaperQsVo {
     private double srate;//分值占比
 
     private double nrate;//数量占比
+
+    private String qns;//小题题号
     public EPaperQsVo(){
 
     }