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

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

 
             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）作为排序使用
                 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);
     }
                     qgstulist = paperstulist.stream().filter(s -> s.getEptqid().equals(eptqid)).collect(Collectors.toList());
                 } else {
                     qgstulist = new ArrayList<>();
+                    List<EPaperStudentQuestion> stuqlist = paperstulist.stream().filter(s -> eptqids.contains(s.getEptqid())).collect(Collectors.toList());
                     //母子题情况，计算所有子题的和即为母题。把试题按照学生分组，分组为一组的即为
-                    Map<Integer, List<EPaperStudentQuestion>> stuQuesMap = paperstulist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
+                    Map<Integer, List<EPaperStudentQuestion>> stuQuesMap = stuqlist.stream().collect(Collectors.groupingBy(EPaperStudentQuestion::getStudentid));
                     for (Map.Entry<Integer, List<EPaperStudentQuestion>> entry : stuQuesMap.entrySet()) {
                         List<EPaperStudentQuestion> stuqueslist = entry.getValue();
                         EPaperStudentQuestion pstq = stuqueslist.get(0);
                         Double qscore = stuqueslist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
                         pstq.setQscore(qscore);
                         pstq.setStuscore(qstuscore);
-                        pstq.setCtype(11);//母子题关系的均设置为复合体，不再进行选项区分
+                        pstq.setCtype(11);//母子题关系的均设置为复合题，不再进行选项区分
                         int bad = 0;
                         int good = 0;
                         for (EPaperStudentQuestion sq : stuqueslist) {
                 eRclassQtype.setScore(score);
                 eRclassQtype.setNum(num);
                 eRclassQtype.setSrate(srate);
-                eRclassQtype.setScore(tgstuscore);
                 eRclassQtype.setGradescore(tgstuscore);
                 eRclassQtype.setGradeavgscore(tgavgscore);
                 eRclassQtype.setGradesrate(tgsrate);

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

 import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.vo.paper.QuestionOrderVo;
 import com.xhkjedu.sexam.vo.paper.QuestionPointVo;
 import com.xhkjedu.utils.N_Utils;
                 map.put("stuanswertxt", q.get("stuanswertxt").toString());
                 map.put("answer", q.get("answer").toString());
                 map.put("qstem", q.get("qstem").toString());
-                map.put("qoption", q.get("qoption").toString());
-                map.put("qanalyze", q.get("qanalyze").toString());
-                map.put("hashear", Integer.parseInt(q.get("hashear").toString()));
-                map.put("hearfile", q.get("hearfile").toString());
+                if(N_Utils.isNotEmpty(q.get("qoption"))){
+                    map.put("qoption", q.get("qoption").toString());
+                }else{
+                    map.put("qoption", "");
+                }
+                if(N_Utils.isNotEmpty(q.get("qanalyze"))){
+                    map.put("qanalyze", q.get("qanalyze").toString());
+                }else{
+                    map.put("qanalyze", "");
+                }
+
+                Integer hashear = Integer.parseInt(q.get("hashear").toString());
+                map.put("hashear", hashear);
+                if(hashear == 1){
+                    map.put("hearfile", q.get("hearfile").toString());
+                }
+
                 map.put("qlevel", qlevel);
-                map.put("classavgscore", Integer.parseInt(q.get("classavgscore").toString()));
-                map.put("gradeavgscore", Integer.parseInt(q.get("gradeavgscore").toString()));
+                map.put("classavgscore", Double.parseDouble(q.get("classavgscore").toString()));
+                map.put("gradeavgscore", Double.parseDouble(q.get("gradeavgscore").toString()));
                 if (q.get("points") != null) {
                     List<Map> points = (List<Map>) q.get("points");
                     map.put("points", points);
                     mq.put("ctype", Integer.parseInt(q.get("mctype").toString()));
                     mq.put("qstem", q.get("mqstem").toString());
                     mq.put("qoption", q.get("mqoption").toString());
-                    mq.put("qanswer", q.get("mqanswer").toString());
-                    mq.put("qanalyze", q.get("mqanalyze").toString());
-                    mq.put("hashear", Integer.parseInt(q.get("mhashear").toString()));
-                    mq.put("hearfile", q.get("mhearfile").toString());
+                    if(N_Utils.isNotEmpty(q.get("mqoption"))){
+                        mq.put("qoption", q.get("mqoption").toString());
+                    }else{
+                        mq.put("qoption", "");
+                    }
+                    if(N_Utils.isNotEmpty(q.get("mqanalyze"))){
+                        mq.put("qanalyze", q.get("mqanalyze").toString());
+                    }else{
+                        mq.put("qanalyze", "");
+                    }
+                    if(N_Utils.isNotEmpty(q.get("mqanswer"))){
+                        mq.put("qanalyze", q.get("mqanswer").toString());
+                    }else{
+                        mq.put("qanalyze", "");
+                    }
+
+                    Integer hashear = Integer.parseInt(q.get("mhashear").toString());
+                    mq.put("hashear", hashear);
+                    if(hashear == 1){
+                        mq.put("hearfile", q.get("mhearfile").toString());
+                    }
                     if (q.get("points") != null) {
                         List<Map> points = (List<Map>) q.get("points");
                         mq.put("points", points);
                 map.put("num",queslist.size());
             }
             map.remove("questions");
-            return list;
         }
         return list;
     }
         List<Map> pointqueslist = new ArrayList<>();
         for(Map pointmap : pointlist){
             //知识点包含的试题
-            List<QuestionOrderVo> ques = (List<QuestionOrderVo>) pointmap.get("ques");
+            List<Map> ques = (List<Map>) pointmap.get("ques");
             List<Integer> eptqidlist = new ArrayList<>();//知识点关联的所有试题
-            for(QuestionOrderVo qovo : ques){
-                Integer[] eptqids = qovo.getEptqids();
-                eptqidlist.addAll(Arrays.asList(eptqids));
+            for(Map qovo : ques){
+                List<Integer> eptqids = (List<Integer>) qovo.get("eptqids");
+                eptqidlist.addAll(eptqids);
             }
             //获取知识点下试题
             List<Map> poinques = list.stream().filter(s -> eptqidlist.contains(Integer.parseInt(s.get("eptqid").toString()))).collect(Collectors.toList());

sexam/src/main/resources/mapper/report/ERstudentMapper.xml

     </select>
     <select id="listQuesPoints" resultType="java.util.Map">
         select p.pointid,p.pointname
-        from t_question_point qp left join t_point p on qp.pointid=p.poingid
+        from t_question_point qp left join t_point p on qp.pointid=p.pointid
         where
         <if test="qlevel==1">
             qp.questionid=#{questionid}
         <result property="subjectname" column="subjectname" />
         <result property="ptype" column="ptype" />
         <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result property="epsqid" column="epsqid" />
             <result property="eptqid" column="eptqid" />
             <result property="questionid" column="questionid" />
             <result property="qlevel" column="qlevel" />
         </collection>
     </resultMap>
     <select id="listStudentSubjectErrorQues" resultMap="listStudentSubjectErrorQues">
-        select sq.subjectid,s.subjectname,sq.eptqid,q.questionid,q.qlevel,q.questionpid
+        select sq.subjectid,s.subjectname,p.ptype,sq.epsqid,sq.eptqid,q.questionid,q.qlevel,q.questionpid
         from e_paper_student_question sq
         left join t_question q on q.questionid=sq.questionid
         left join t_subject s on sq.subjectid=s.subjectid
         left join t_question mq on q.questionpid=mq.questionid
-        where sq.examid=#{examid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore group by s.subjectid order by s.subjectorder
+        left join e_paper p on sq.epid=p.epid
+        where sq.examid=#{examid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore group by sq.epsqid order by s.subjectorder
     </select>
     <!--学生报告-错题集-学生科目下错题（题库）-->
     <select id="listStudentErrorQuestionsForTk" resultMap="listStudentQues">