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

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -577,6 +577,17 @@ public class N_Utils {
         return count.doubleValue();
     }
 
+    public static double getDoubleDivideForAvg(Double linecount, Integer studentnum){
+        if (isEmptyInteger(studentnum) || linecount == null) {
+            return 0;
+        }
+        BigDecimal b1 = new BigDecimal(linecount.toString());
+        BigDecimal b2 = new BigDecimal(studentnum.toString());
+
+        BigDecimal count = b1.divide(b2,2,BigDecimal.ROUND_DOWN);
+        return count.doubleValue();
+    }
+
     //两个double 类型相加
     public static Double getDoubleSum(Double value1,Double value2){
         BigDecimal b1 = new BigDecimal(Double.toString(value1));
@@ -1038,5 +1049,4 @@ public class N_Utils {
             return false;
         }
     }
-
 }

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

@@ -22,6 +22,9 @@ public class ERclassQuestion extends BaseBean {
     //科目id
     private String subjectid;
 
+    //试卷id
+    private Integer epid;
+
     //试题主键id
     private Integer eptqid;
 
@@ -31,12 +34,6 @@ public class ERclassQuestion extends BaseBean {
     //试题排序
     private Integer qorder;
 
-    //班级试题得分
-    private Double qscore;
-
-    //试题难易度
-    private Integer complexity;
-
     //班级得分
     private Double classscore;
 

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

@@ -152,6 +152,7 @@ public class EPaperQtypeService {
         ePaperQtypeMapper.insertList(qtypelist);//保存题型
         for(EPaperQtype qtype : qtypelist){
             List<EPaperQtypeQuestion> questions = qtype.getQuestions();
+            qtype.setEptid(qtype.getId());
 
             for (int i = 0; i < questions.size(); i++) {
                 EPaperQtypeQuestion q=questions.get(i);
@@ -418,7 +419,7 @@ public class EPaperQtypeService {
                     List<Integer> saveids = new ArrayList<>();
                     saveids.add(dq.getEptqid());
                     questionPointVo.setEptqids(saveids);
-                    questionPointVo.setEptqid(dq.getEptid());
+                    questionPointVo.setEptqid(dq.getEptqid());
                 }else{
                     questionPointVo.setEptqids(eptqids);
                     questionPointVo.setEptqid(0);
@@ -473,14 +474,13 @@ public class EPaperQtypeService {
                 questionPointVo.setScore(dq.getScore());
                 questionPointVo.setQlevel(dq.getQlevel());
                 questionPointVo.setQuestionid(dq.getQuestionid());
-
                 questionPointVo.setPointids(pointids);
-
                 if(N_Utils.isListEmpty(eptqids)){
                     List<Integer> saveids = new ArrayList<>();
                     saveids.add(dq.getEptqid());
                     questionPointVo.setEptqids(saveids);
-                    questionPointVo.setEptqid(dq.getEptid());
+                    questionPointVo.setEptqid(dq.getEptqid());
+
                 }else{
                     questionPointVo.setEptqids(eptqids);
                     questionPointVo.setEptqid(0);
@@ -499,11 +499,12 @@ public class EPaperQtypeService {
                 List<Integer> saveids = new ArrayList<>();
                 saveids.add(dq.getEptqid());
                 questionPointVo.setEptqids(saveids);
-                questionPointVo.setEptqid(dq.getEptid());
+                questionPointVo.setEptqid(dq.getEptqid());
             }else{
                 questionPointVo.setEptqids(eptqids);
                 questionPointVo.setEptqid(0);
             }
+
             quesplist.add(questionPointVo);
         }
     }

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

@@ -304,7 +304,7 @@ public class EReportGenerateService {
         }
         eRstudentMapper.insertList(classSubjectStudents);
 
-        setClassQuestion(examid, subjects, classes);//题型试题
+//        setClassQuestion(examid, subjects, classes);//题型试题
         setClassGradeRankAll(examid, papers, classSubjectStudents, createid);//班级等级分布
         setAction(examid, subjectMap);//行为分析
     }
@@ -997,6 +997,15 @@ public class EReportGenerateService {
         }
     }
 
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveClassQuestions(Integer examid){
+        List<Map> classes = eClassMapper.listByExamId(examid);
+        List<Map> subjects = eReportGenerateMapper.listSubject(examid);
+        setClassQuestion(examid,subjects,classes);
+
+    }
+
     //题型、试题、知识点
     private void setClassQuestion(Integer examid, List<Map> subjects, List<Map> classes) {
         //考试所有学生提交试卷作答情况
@@ -1027,17 +1036,17 @@ public class EReportGenerateService {
 
             if (ptype == 1) {
                 //处理题型下试题：题库显示题号时为母题的题号即order（qn是英语为顺延题号其他学科为母题号和子题排序拼接）
-                String qtypejson = panalyze.get("qnumjson").toString();//原试卷题型分析
+               /* String qtypejson = panalyze.get("qnumjson").toString();//原试卷题型分析
                 List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
-                setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
+                setPaperQuestionTkQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);*/
 
                 //处理知识点
                 setEPaperQuestionPoints(panalyze, paperstulist, rpointlist, stupointlist, examPaperClassVo);
 
                 //处理难易度
-                String complexityjson = panalyze.get("complexityjson").toString();
+               /* String complexityjson = panalyze.get("complexityjson").toString();
                 List<Map> complexitylist = JSON.parseArray(complexityjson, Map.class);
-                setEPaperQuestionComplexitys(complexitylist, paperstulist, complist, stucomplist, examPaperClassVo);
+                setEPaperQuestionComplexitys(complexitylist, paperstulist, complist, stucomplist, examPaperClassVo);*/
 
             } else {
                 //处理题型及题型下试题：附件显示题号为qn（order）作为排序使用
@@ -1046,11 +1055,11 @@ public class EReportGenerateService {
                 setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
             }
         }
-        eRclassQtypeMapper.insertList(rtypelist);
+        /*eRclassQtypeMapper.insertList(rtypelist);
         eRstudentQtypeMapper.insertList(stutypelist);
         eRclassQuestionMapper.insertList(rqueslist);
         eRclassComplexityMapper.insertList(complist);
-        erStudentComplexityMapper.insertList(stucomplist);
+        erStudentComplexityMapper.insertList(stucomplist);*/
         eRclassPointMapper.insertList(rpointlist);
         eRstudentPointMapper.insertList(stupointlist);
     }
@@ -1073,10 +1082,12 @@ public class EReportGenerateService {
             EPaperStudentQuestion sq = classStu.get(i);
             String stuanswer = sq.getStuanswer();
             if (q.getCtype() == 1 || q.getCtype() == 2 || q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() == 6) {
-                String answeroption = "未选择";
+                String answeroption = "未作答";
                 if (N_Utils.isNotEmpty(stuanswer)) {
                     List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
-                    answeroption = stuanswers.get(0);
+                    if(N_Utils.isListNotEmpty(stuanswers)){
+                        answeroption = stuanswers.get(0);
+                    }
                 }
 
                 Map stumap = new HashMap();
@@ -1146,7 +1157,7 @@ public class EReportGenerateService {
         List<Map> classes = examPaperClassVo.getClasses();
         for (int k = 0; k < qtypelist.size(); k++) {
             Map qtypemap = qtypelist.get(k);
-            String qtypename = qtypemap.get("qtypename").toString();
+            String qtypename = qtypemap.get("qtname").toString();
             String qtypeid = qtypemap.get("qtid").toString();
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
@@ -1183,7 +1194,7 @@ public class EReportGenerateService {
                     EPaperStudentQuestion qcmaxstu = qcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                     Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
                     Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
-                    Double qcavgscore = N_Utils.getDoubleDivideAndMulitiply(qcstuscore, cstunum);
+                    Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore, cstunum);
                     Double qcsrate = N_Utils.getDoubleDivideAndMulitiply(qcstuscore, qcscore);
 
                     //班级单题情况
@@ -1191,6 +1202,7 @@ public class EReportGenerateService {
                     ercq.setExamid(examPaperClassVo.getExamid());
                     ercq.setClassid(classid);
                     ercq.setSubjectid(examPaperClassVo.getSubjectid());
+                    ercq.setEpid(examPaperClassVo.getEpid());
                     ercq.setEptqid(eptqid);
                     ercq.setQn(qns.get(q));
                     ercq.setQorder(orders.get(q));
@@ -1212,7 +1224,7 @@ public class EReportGenerateService {
                     if (tclassmap.containsKey(classid)) {
                         ERClassScoreVo erClassScoreVo = tclassmap.get(classid);
                         erClassScoreVo.setStuscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcstuscore));
-                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcscore));
+                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getCscore(), qcscore));
                     } else {
                         ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
                         erClassScoreVo.setStunum(cstunum);
@@ -1230,12 +1242,13 @@ public class EReportGenerateService {
                             sq.setClassid(psq.getClassid());
                             sq.setStudentid(psq.getStudentid());
                             sq.setStuscore(psq.getStuscore());
+                            tstumap.put(psq.getStudentid(),sq);
                         }
                     }
                 }
             }
 
-            Double tgavgscore = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, gstunum);//题型下年级平均分
+            Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore, gstunum);//题型下年级平均分
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
 
             //题型--班级得分
@@ -1254,8 +1267,8 @@ public class EReportGenerateService {
                 eRclassQtype.setGradescore(tgstuscore);
                 eRclassQtype.setGradeavgscore(tgavgscore);
                 eRclassQtype.setGradesrate(tgsrate);
-                eRclassQtype.setClasssrate(erClassScoreVo.getStuscore());
-                eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
+                eRclassQtype.setClassscore(erClassScoreVo.getStuscore());
+                eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideForAvg(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
                 eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getCscore()));
                 eRclassQtype.setQns(qns.stream().map(String::valueOf).collect(Collectors.joining(",")));
                 rtypelist.add(eRclassQtype);
@@ -1281,7 +1294,7 @@ public class EReportGenerateService {
         List<Map> classes = examPaperClassVo.getClasses();
         for (int k = 0; k < qtypelist.size(); k++) {
             Map qtypemap = qtypelist.get(k);
-            String qtypename = qtypemap.get("qtypename").toString();
+            String qtypename = qtypemap.get("qtname").toString();
             String qtypeid = qtypemap.get("qtid").toString();
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
@@ -1301,7 +1314,7 @@ public class EReportGenerateService {
                 Integer qlevel = Integer.parseInt(quesmap.get("qlevel").toString());
                 String order = quesmap.get("order").toString();//试题母题题号
                 List<String> qnslist = (List<String>) quesmap.get("qns");
-                qns = order + ",";
+                qns = qns + order + ",";
 
                 //单题小题统计
                 for (int l = 0; l < eptqids.size(); l++) {
@@ -1310,7 +1323,7 @@ public class EReportGenerateService {
                     EPaperStudentQuestion sqgmaxstu = sqstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                     Double sqgstuscore = sqstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
                     Double sqgscore = sqstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
-                    Double sqgavgscore = N_Utils.getDoubleDivideAndMulitiply(sqgstuscore, sqstulist.size());
+                    Double sqgavgscore = N_Utils.getDoubleDivideForAvg(sqgstuscore, sqstulist.size());
                     Double sqgsrate = N_Utils.getDoubleDivideAndMulitiply(sqgstuscore, sqgscore);
 
                     for (Map classm : classes) {
@@ -1320,13 +1333,14 @@ public class EReportGenerateService {
                         EPaperStudentQuestion sqcmaxstu = sqcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
                         Double sqcscore = sqcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
                         Double sqcstuscore = sqcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
-                        Double qcavgscore = N_Utils.getDoubleDivideAndMulitiply(sqcstuscore, cstunum);
+                        Double qcavgscore = N_Utils.getDoubleDivideForAvg(sqcstuscore, cstunum);
                         Double qcsrate = N_Utils.getDoubleDivideAndMulitiply(sqcstuscore, sqcscore);
                         //班级单题情况
                         ERclassQuestion ercq = new ERclassQuestion();
                         ercq.setExamid(examPaperClassVo.getExamid());
                         ercq.setClassid(classid);
                         ercq.setSubjectid(examPaperClassVo.getSubjectid());
+                        ercq.setEpid(examPaperClassVo.getEpid());
                         ercq.setEptqid(eptqid);
                         ercq.setQn(qnslist.get(l));
                         ercq.setQorder(Integer.parseInt(order));
@@ -1400,7 +1414,7 @@ public class EReportGenerateService {
                     if (tclassmap.containsKey(classid)) {
                         ERClassScoreVo erClassScoreVo = tclassmap.get(classid);
                         erClassScoreVo.setStuscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcstuscore));
-                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcscore));
+                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getCscore(), qcscore));
                     } else {
                         ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
                         erClassScoreVo.setStunum(cstunum);
@@ -1417,12 +1431,13 @@ public class EReportGenerateService {
                             sq.setClassid(psq.getClassid());
                             sq.setStudentid(psq.getStudentid());
                             sq.setStuscore(psq.getStuscore());
+                            tstumap.put(psq.getStudentid(),sq);
                         }
                     }
                 }
             }
 
-            Double tgavgscore = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, gstunum);//题型下年级平均分
+            Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore, gstunum);//题型下年级平均分
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
 
             //题型--班级得分
@@ -1439,10 +1454,11 @@ public class EReportGenerateService {
                 eRclassQtype.setNum(num);
                 eRclassQtype.setSrate(srate);
                 eRclassQtype.setScore(tgstuscore);
+                eRclassQtype.setGradescore(tgstuscore);
                 eRclassQtype.setGradeavgscore(tgavgscore);
                 eRclassQtype.setGradesrate(tgsrate);
                 eRclassQtype.setClassscore(erClassScoreVo.getStuscore());
-                eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
+                eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideForAvg(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
                 eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getCscore()));
                 eRclassQtype.setQns(qns.substring(0, qns.lastIndexOf(",")));
                 rtypelist.add(eRclassQtype);
@@ -1488,7 +1504,7 @@ public class EReportGenerateService {
                     //说明改题为复合体，获取所有子题
                     List<Integer> eptqids = qpoint.getEptqids();
                     List<EPaperStudentQuestion> stuqueslist = paperstulist.stream().filter(s ->eptqids.contains(s.getEptqid())).collect(Collectors.toList());
-                    //根据每个学生分组获取每个学生改题分值
+                    //根据每个学生分组获取每个学生该题分值
                     Map<Integer,List<EPaperStudentQuestion>> stuquesmap = stuqueslist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
                     for(Map.Entry<Integer,List<EPaperStudentQuestion>> entry : stuquesmap.entrySet()){
                         List<EPaperStudentQuestion> stuques = entry.getValue();
@@ -1507,8 +1523,8 @@ public class EReportGenerateService {
             String pointname = map.get("pointname").toString();
             Double pointscore = Double.parseDouble(map.get("score").toString());
             Double pointrate = Double.parseDouble(map.get("srate").toString());
-            List<QuestionOrderVo> qorders = (List<QuestionOrderVo>) map.get("ques");
-            List<Integer> orders = qorders.stream().map(QuestionOrderVo::getOrder).collect(Collectors.toList());
+            List<Map> qorders = (List<Map>) map.get("ques");
+            List<Integer> orders = qorders.stream().map(s -> Integer.parseInt(s.get("order").toString())).collect(Collectors.toList());
             String orderstr = orders.stream().map(String::valueOf).collect(Collectors.joining(","));//试题
             //单个知识点学生得分情况:一个知识对应一个或多个试题，
             List<ERPointStuScoreVo> gradepointstulist = gradestulist.stream().filter(s -> s.getPointid().equals(pointid)).collect(Collectors.toList());
@@ -1518,25 +1534,24 @@ public class EReportGenerateService {
             for(Map.Entry<Integer,List<ERPointStuScoreVo>> entry : pointstuscoremap.entrySet()){
                 List<ERPointStuScoreVo> stuscorelist = entry.getValue();
                 Double stuscore = stuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-                Double qscore = stuscorelist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
+//                Double qscore = stuscorelist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
                 ERPointStuScoreVo sscorevo = stuscorelist.get(0);
                 sscorevo.setStuscore(stuscore);
-                sscorevo.setScore(qscore);
+//                sscorevo.setScore(qscore);
                 pointstuscorelist.add(sscorevo);
             }
 
             Double gstuscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-            Double gscore = pointstuscorelist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-            Double gavgscore = N_Utils.getDoubleDivideAndMulitiply(gstuscore,pointstuscorelist.size());
-            Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore,gscore);
+            Double gavgscore = N_Utils.getDoubleDivideForAvg(gstuscore,pointstuscorelist.size());
+            Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore,pointscore * pointstuscorelist.size());
 
             for(Map classm : classes){
                 Integer classid = Integer.parseInt(classm.get("classid").toString());
                 List<ERPointStuScoreVo> classpointstulist = pointstuscorelist.stream().filter(s->s.getClassid().equals(classid)).collect(Collectors.toList());
                 Double cstuscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getStuscore).sum();
-                Double cscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
-                Double cavgscore = N_Utils.getDoubleDivideAndMulitiply(cstuscore,classpointstulist.size());
-                Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore,cscore);
+//                Double cscore = classpointstulist.stream().mapToDouble(ERPointStuScoreVo::getScore).sum();
+                Double cavgscore = N_Utils.getDoubleDivideForAvg(cstuscore,classpointstulist.size());
+                Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore,pointscore * classpointstulist.size());
 
                 ERclassPoint eRclassPoint = new ERclassPoint();
                 eRclassPoint.setExamid(examPaperClassVo.getExamid());
@@ -1567,7 +1582,7 @@ public class EReportGenerateService {
                     erstupoint.setPointid(pointid);
                     erstupoint.setPointname(pointname);
                     erstupoint.setStuscore(stu.getStuscore());
-                    erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(),stu.getScore()));
+                    erstupoint.setStusrate(N_Utils.getDoubleDivideAndMulitiply(stu.getStuscore(),pointscore));
                     stupointlist.add(erstupoint);
                 }
             }
@@ -1585,8 +1600,8 @@ public class EReportGenerateService {
             pscvo.setClassid(sq.getClassid());
             pscvo.setStudentid(sq.getStudentid());
             pscvo.setStuscore(sq.getStuscore());
-            pscvo.setScore(Double.parseDouble(pointmap.get("score").toString()));
-            pscvo.setPointid(pointmap.get("pointid").toString());
+            String pointid = pointmap.get("pointid").toString();
+            pscvo.setPointid(pointid);
             gradestulist.add(pscvo);
         }else{
             //计算每个知识点所占分值（平均分配）
@@ -1596,8 +1611,8 @@ public class EReportGenerateService {
                 ERPointStuScoreVo pscvo = new ERPointStuScoreVo();
                 pscvo.setClassid(sq.getClassid());
                 pscvo.setStudentid(sq.getStudentid());
-                pscvo.setScore(Double.parseDouble(pointmap.get("score").toString()));
-                pscvo.setPointid(pointmap.get("pointid").toString());
+                String pointid = pointmap.get("pointid").toString();
+                pscvo.setPointid(pointid);
                 if(avgps.length == 2 && (j+1) == points.size()){
                     pscvo.setStuscore(avgps[1]);
                 }else{
@@ -1614,7 +1629,7 @@ public class EReportGenerateService {
                                               List<ERStudentComplexity> stucomplist, ExamPaperClassVo examPaperClassVo) {
         List<Map> classes = examPaperClassVo.getClasses();
         for (Map compmap : complexitylist) {
-            Integer complexity = Integer.parseInt(compmap.get("complexity").toString());
+            Integer complexity = Integer.parseInt(compmap.get("level").toString());
             Double score = Double.parseDouble(compmap.get("score").toString());//难易度下试题总分值
             Double srate = Double.parseDouble(compmap.get("srate").toString());//难易度下试题分值占比
             List<Map> queslist = (List<Map>) compmap.get("ques");//试题相关对象（数量为几个代表几个母题）
@@ -1629,7 +1644,7 @@ public class EReportGenerateService {
                 List<Integer> eptqids = (List<Integer>) quesmap.get("eptqids");
                 Integer qlevel = Integer.parseInt(quesmap.get("qlevel").toString());
                 String order = quesmap.get("order").toString();//试题母题题号
-                qns = order + ",";
+                qns = qns + order + ",";
 
                 //获取集合中对应子题集合的数据
                 List<EPaperStudentQuestion> qgstulist = null;
@@ -1666,7 +1681,7 @@ public class EReportGenerateService {
                     if (tclassmap.containsKey(classid)) {
                         ERClassScoreVo erClassScoreVo = tclassmap.get(classid);
                         erClassScoreVo.setStuscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcstuscore));
-                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcscore));
+                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getCscore(), qcscore));
                     } else {
                         ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
                         erClassScoreVo.setStunum(cstunum);
@@ -1680,10 +1695,11 @@ public class EReportGenerateService {
                             ERStudentComplexity sq = tstumap.get(q.getStudentid());
                             sq.setStuscore(ExamUtil.add(sq.getStuscore(), q.getStuscore()));
                         } else {
-                            ERStudentQtype sq = new ERStudentQtype();
+                            ERStudentComplexity sq = new ERStudentComplexity();
                             sq.setClassid(q.getClassid());
                             sq.setStudentid(q.getStudentid());
                             sq.setStuscore(q.getStuscore());
+                            tstumap.put(q.getStudentid(),sq);
                         }
                     }
                 }
@@ -1702,7 +1718,7 @@ public class EReportGenerateService {
                 erc.setComplexity(complexity);
                 erc.setScore(score);
                 erc.setSrate(srate);
-                erc.setScore(tgstuscore);
+                erc.setGradescore(tgstuscore);
                 erc.setGradesrate(tgsrate);
                 erc.setClassscore(erClassScoreVo.getStuscore());
                 erc.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getCscore()));

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionMapper.xml

@@ -132,7 +132,7 @@
 
     <!--报告生成-学生试卷-->
     <select id="listExamStudentsAnswer" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
-        select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.qn,q.answertype,q.stuanswer,q.qscore,q.stuscore,q.good,q.bad,u.username stuname
+        select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.ctype,q.qn,q.answertype,q.stuanswer,q.qscore,q.stuscore,q.good,q.bad,u.username stuname
         from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
         left join t_user u on q.studentid=u.userid where s.examid=#{examid} and s.sstate=2 group by q.epsqid
     </select>