报告生成-题型

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportstu/ERstudentQtypeMapper.java

@@ -0,0 +1,7 @@
+package com.xhkjedu.sexam.mapper.reportstu;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.reportstu.ERStudentQtype;
+
+public interface ERstudentQtypeMapper extends TkMapper<ERStudentQtype> {
+}

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

@@ -17,7 +17,7 @@ public class ERstudentPoint extends BaseBean {
     private Integer examid;
 
     //科目id
-    private Integer subjectid;
+    private String subjectid;
 
     //学生id
     private Integer studentid;

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

@@ -14,6 +14,8 @@ import com.xhkjedu.sexam.mapper.reportclass.ERclassQtypeMapper;
 import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionMapper;
 import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionPointMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.mapper.reportstu.ERstudentPointMapper;
+import com.xhkjedu.sexam.mapper.reportstu.ERstudentQtypeMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.report.ERbase;
 import com.xhkjedu.sexam.model.report.ERsubject;
@@ -66,7 +68,6 @@ public class EReportGenerateService {
     @Resource
     private EPaperAnalyzeMapper ePaperAnalyzeMapper;
 
-
     @Resource
     private ERbaseMapper eRbaseMapper;
     @Resource
@@ -81,6 +82,10 @@ public class EReportGenerateService {
     private ERclassQuestionMapper eRclassQuestionMapper;
     @Resource
     private ERclassQuestionPointMapper eRclassQuestionPointMapper;
+    @Resource
+    private ERstudentPointMapper eRstudentPointMapper;
+    @Resource
+    private ERstudentQtypeMapper eRstudentQtypeMapper;
 
 
     //生成考试报告
@@ -368,6 +373,11 @@ public class EReportGenerateService {
 
             //获取试卷只是分析
             Map epa = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
+            String qtypejson = epa.get("qnumjson").toString();//原试卷题型分析
+            List<Map> qtypelist = JSON.parseArray(qtypejson,Map.class);
+            for(int k = 0;k<qtypelist.size();k++){
+                
+            }
 
             //遍及试卷处理题型下各班级得分情况
             for(EPaperQtypeVo t : fjtypelist){
@@ -470,6 +480,7 @@ public class EReportGenerateService {
                 }
             }
 
+
             //仅有题库试卷有知识点
             if(ptype == 1){
                 String pointjson = epa.get("pointjson").toString();
@@ -512,12 +523,16 @@ public class EReportGenerateService {
                         pointvo.setClasssrate(csrate);
                         rpointlist.add(pointvo);
                     }
+
+                    setEPaperQuestionPointsStu(gstus,stupoints,subjectid,pointid,pointname);
                 }
             }
         }
         eRclassQtypeMapper.insertList(rtypelist);
         eRclassQuestionMapper.insertList(rqlist);
         eRclassQuestionPointMapper.insertList(rpointlist);
+        eRstudentPointMapper.insertList(stupoints);
+        eRstudentQtypeMapper.insertList(stuqtypes);
     }
     //处理题库试卷中子母题
     private void setEPaperQtypeForQues(List<EPaperQtypeVo> fjtypelist){
@@ -660,5 +675,34 @@ public class EReportGenerateService {
         return rtnmap;
     }
 
+    //设置学生知识点关联试题得分
+    private void setEPaperQuestionPointsStu(List<EPaperStudentQuestion> gstus,List<ERstudentPoint> stupoints,String subjectid,String pointid,String pointname){
+        //把试题按学生进行分组然后进行计算
+        Map<Integer,List<EPaperStudentQuestion>> stuMap = gstus.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid,Collectors.toList()));
+        for(Map.Entry<Integer,List<EPaperStudentQuestion>> entry: stuMap.entrySet()){
+            List<EPaperStudentQuestion> stuq = entry.getValue();
+            EPaperStudentQuestion sq = stuq.get(0);
+            Double qscore = stuq.stream().mapToDouble(o -> o.getQscore()).sum();
+            Double stuscore = stuq.stream().mapToDouble(o -> o.getStuscore()).sum();
+            Double srate = N_Utils.getDoubleDivideAndMulitiply(stuscore,qscore);
+            ERstudentPoint eRstudentPoint = new ERstudentPoint();
+            eRstudentPoint.setExamid(sq.getExamid());
+            eRstudentPoint.setSubjectid(subjectid);
+            eRstudentPoint.setStudentid(entry.getKey());
+            eRstudentPoint.setClassid(sq.getClassid());
+            eRstudentPoint.setPointid(pointid);
+            eRstudentPoint.setPointname(pointname);
+            eRstudentPoint.setStuscore(stuscore);
+            eRstudentPoint.setStusrate(srate);
+
+
+        }
+
+
+    }
+
+    //设置学生题型下试题得分
+    private void setEPaperQuestionQtypesStu(List<EPaperStudentQuestion> gstus,List<ERstudentPoint> stupoints){
 
+    }
 }