完善试卷分析

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

 import com.xhkjedu.sexam.vo.paper.QuestionOrderVo;
 import com.xhkjedu.sexam.vo.paper.QuestionPointVo;
 import com.xhkjedu.utils.N_Utils;
+import org.apache.commons.lang.SerializationUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.util.*;
 import java.util.stream.Collectors;
                 q.remove("mhashear");
                 q.remove("mhearfile");
                 q.remove("mquestionid");
+                q.remove("mcomplexity");
                 q.remove("mctype");
                 q.remove("questionpid");
                 rtnlist.add(q);
                         List<Map> points = (List<Map>) q.get("points");
                         mq.put("points", points);
                     }
+                    mq.put("complexity",q.get("mcomplexity").toString());
+                    mq.put("classavgscore",q.get("classavgscore").toString());
+                    mq.put("gradeavgscore",q.get("gradeavgscore").toString());
 
                     Double stuscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("stuscore").toString())).sum();
                     Double pscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
                     mq.put("qscore",pscore);
                     mq.put("stuscore",stuscore);
                     mq.put("srate", N_Utils.getDoubleDivideAndMulitiply(stuscore, pscore));
+
                     for(Map sonmap : sonqueslist){
                         sonmap.remove("mqstem");
                         sonmap.remove("msum");
                         sonmap.remove("mhearfile");
                         sonmap.remove("mquestionid");
                         sonmap.remove("mctype");
+                        sonmap.remove("mcomplexity");
                         sonmap.remove("points");
                         sonmap.remove("hashear");
                         sonmap.remove("hearfile");
                 Map pmap = new HashMap();
                 pmap.put("pointid", pointmap.get("pointid").toString());
                 pmap.put("pointname", pointmap.get("pointname").toString());
-                pmap.put("questions", setPaperQuestionForTK(poinques));
+                List<Map> plist = new ArrayList<>();
+                String jsonlist = JSON.toJSONString(poinques);
+                plist = JSON.parseArray(jsonlist,Map.class);
+                pmap.put("questions", setPaperQuestionForTK(plist));
                 pointqueslist.add(pmap);
             }
         }

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

         <result property="hearfile" column="hearfile" />
         <result property="qlevel" column="qlevel" />
         <result property="sorder" column="sorder" />
+        <result property="complexity" column="complexity" />
         <result property="questionpid" column="questionpid" />
         <result property="mquestionid" column="mquestionid" />
         <result property="mqstem" column="mqstem" />
         <result property="mqlevel" column="mqlevel" />
         <result property="mctype" column="mctype" />
         <result property="msnum" column="msnum" />
+        <result property="mcomplexity" column="mcomplexity" />
         <result property="classavgscore" column="classavgscore" />
         <result property="gradeavgscore" column="gradeavgscore" />
         <collection property="points" ofType="java.util.Map" javaType="java.util.List"
     <select id="listStudentQuestionsTk" resultMap="listStudentQues">
         select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
         sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,q.qstem,q.qoption,q.qanalyze,q.hashear,q.hearfile,
-        q.qlevel,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
+        q.qlevel,q.sorder,q.complexity,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
         mq.qanalyze mqanalyze,mq.hashear mhashear,mq.hearfile mhearfile,mq.qlevel mqlevel,mq.ctype mctype,mq.snum msnum,
-        cq.classavgscore,cq.gradeavgscore
+        mq.complexity mcomplexity,cq.classavgscore,cq.gradeavgscore
         from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid
-        left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
+        left join e_rclass_question cq on (sq.questionid=cq.questionid or mq.questionid=cq.questionid)
         left join e_paper_qtype_question pq on sq.eptqid=pq.eptqid
         where sq.epid=#{epid} and sq.studentid=#{studentid} GROUP BY sq.epsqid order by sq.qorder,q.sorder
     </select>
 
     <!--学生报告-试卷分析（题库）-->
     <select id="listStudentQuestionsFj" resultType="java.util.Map">
-        select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
-               sq.answertype,sq.stuanswer,sq.stuanswertxt,cq.classavgscore,cq.gradeavgscore
+        select sq.epsqid,sq.eptqid,sq.ctype,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
+               sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,pq.qtypename,cq.classavgscore,cq.gradeavgscore
         from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
+        left join e_paper_qtype_question pq on sq.eptqid=pq.eptqid
         where sq.epid=#{epid} and sq.studentid=#{studentid} group by sq.epsqid order by sq.qorder
     </select>
 
     <select id="listStudentErrorQuestionsForTk" resultMap="listStudentQues">
         select sq.epsqid,sq.eptqid,sq.ctype,sq.questionid,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
                sq.answertype,sq.stuanswer,sq.stuanswertxt,pq.answer,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.hashear,q.hearfile,
-               q.qlevel,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
+               q.qlevel,q.sorder,q.complexity,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,mq.qoption mqoption,mq.qanswer mqanswer,
                mq.qanalyze mqanalyze,mq.hashear mhashear,mq.hearfile mhearfile,mq.qlevel mqlevel,mq.ctype mctype,mq.snum msnum,
-               cq.classavgscore,cq.gradeavgscore
+               mq.complexity mcomplexity,cq.classavgscore,cq.gradeavgscore
         from e_paper_student_question sq left join t_question q on sq.questionid=q.questionid
         left join t_question mq on q.questionpid=mq.questionid
-        left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
+        left join e_rclass_question cq on (sq.questionid=cq.questionid or mq.questionid=cq.questionid)
         left join e_paper_qtype_question pq on sq.eptqid=pq.eptqid
         where sq.examid=#{examid} and sq.subjectid=#{subjectid} and sq.studentid=#{studentid} and sq.stuscore &lt; sq.qscore
         GROUP BY sq.epsqid order by sq.qorder,q.sorder
         from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
         left join e_paper_qtype_question q on sq.eptqid=q.eptqid
         where sq.examid=#{examid} and sq.subjectid=#{subjectid} and sq.studentid=#{studentid} group by sq.epsqid order by sq.qorder
-
     </select>
 
 </mapper>

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

 
     @Resource
     private EReportGenerateService eReportGenerateService;
+    @Resource
+    private EPaperQtypeService ePaperQtypeService;
 
     @Test
     void contextLoads() {
 //        eReportGenerateService.saveClassQuestions(2);
+//        EPaper epaper = new EPaper();
+//        epaper.setEpid(6);
+//        epaper.setPnum(12);
+//        epaper.setPscore(100.0);
+//        ePaperQtypeService.savePaperAnalyzeForQuestion(epaper);
+
     }
 
 }