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

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

      **/
     public List<Map> listSubjectQuestions(Integer examid, Integer studentid, String subjectid) {
         List<Map> list = eRstudentMapper.listSubjectQuestions(examid, studentid, subjectid);
+        Double paperscore = list.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
         for (Map m : list) {
             Double stuscore = Double.parseDouble(m.get("stuscore").toString());
             Double qscore = Double.parseDouble(m.get("qscore").toString());
             Double stusrate = N_Utils.getDoubleDivideAndMulitiply(stuscore, qscore);
             m.put("stusrate", stusrate);
+            Double srate = N_Utils.getDoubleDivideAndMulitiply(qscore,paperscore);
+            m.put("srate",srate);
         }
         return list;
     }

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

     <!--获取学生试卷基础信息和得分-->
     <select id="getStudentPaperScore" resultType="java.util.Map">
         SELECT ps.epsid,ps.epid,ps.studentid,u.username stuname,u.loginname,ps.stuscore,s.subjectid,s.subjectname,
-        e.examname,e.gradeid,c.classname,p.ptype,p.hearfile
+        e.examname,e.gradeid,c.classname,p.ptype,p.hasfile,p.hearfile,p.hearnum
         from e_paper_student ps left join e_subject s on ps.esid=s.esid
         left join e_paper p on ps.epid = p.epid
         left join e_base e on ps.examid=e.examid

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

     <select id="listSubjectPoints" resultType="java.util.Map">
         select sp.pointid,sp.pointname,sp.stuscore,sp.stusrate,cp.score,cp.srate,cp.gradescore,cp.gradesrate,cp.classscore,cp.classsrate,cp.qns
         from e_rstudent_point sp left join e_rclass_point cp on sp.examid=cp.examid
-            and sp.subjectid=cp.subjectid and sp.pointid=cp.pointid
+            and sp.subjectid=cp.subjectid and sp.pointid=cp.pointid and sp.classid=cp.classid
         where sp.examid=#{examid} and sp.subjectid=#{subjectid} and sp.studentid=#{studentid} order by sp.pointid
     </select>
     <!--学生报告-学科分析-难易度分析-->
     <select id="listSubjectComplexitys" resultType="java.util.Map">
         select sc.complexity,sc.stuscore,sc.stusrate,cc.score,cc.srate,cc.gradescore,cc.gradesrate,cc.classscore,cc.classsrate,cc.qns
         from e_rstudent_complexity sc left join e_rclass_complexity cc on sc.examid=cc.examid
-            and sc.subjectid=cc.subjectid and sc.complexity=cc.complexity
+            and sc.subjectid=cc.subjectid and sc.complexity=cc.complexity and sc.classid=cc.classid
         where sc.examid=#{examid} and sc.subjectid=#{subjectid} and sc.studentid=#{studentid} order by sc.complexity
     </select>
     <!--学生报告-学科分析-题型分析-->
     <select id="listSubjectQtypes" resultType="java.util.Map">
         select st.qtypename,st.stuscore,st.stusrate,ct.score,ct.srate,ct.gradescore,ct.gradesrate,ct.classscore,ct.classsrate,ct.qns
         from e_rstudent_qtype st left join e_rclass_qtype ct on st.examid=ct.examid
-            and st.subjectid=ct.subjectid and st.qtypeid=ct.qtypeid
-        where st.examid=#{examid} and st.subjectid=#{subjectid} and st.studentid=#{studentid}
+            and st.subjectid=ct.subjectid and st.qtypeid=ct.qtypeid and st.classid=ct.classid
+        where st.examid=#{examid} and st.subjectid=#{subjectid} and st.studentid=#{studentid} order by st.erstid
     </select>
     <!--学生报告-学科分析-试题分析-->
     <select id="listSubjectQuestions" resultType="java.util.Map">
         select sq.qn,sq.qorder,sq.stuscore,sq.qscore,q.qtypeid,q.qtypename,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate
         from e_paper_student_question sq left join e_paper_student ps on sq.epsid=ps.epsid
         left join e_paper_qtype_question q on sq.eptqid=q.eptqid
-        left join e_rclass_question cq on ps.examid=cq.examid and sq.eptqid=cq.eptqid
+        left join e_rclass_question cq on ps.examid=cq.examid and sq.eptqid=cq.eptqid and sq.classid=cq.classid
         and cq.eptqid=cq.eptqid where ps.examid=#{examid} and ps.subjectid=#{subjectid} and sq.studentid=#{studentid} order by sq.eptqid
     </select>
 
         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
+        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,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
-        from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid
+        from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid and sq.classid=cq.classid
         where sq.epid=#{epid} and sq.studentid=#{studentid} group by sq.epsqid order by sq.qorder
     </select>
 
                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
+        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.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
         select sq.epsqid,sq.eptqid,sq.ctype,sq.qn,sq.qorder,sq.qscore,sq.stuscore,sq.answered,
                sq.answertype,sq.stuanswer,sq.stuanswertxt,q.qtypeid,q.qtypename,q.optionnum,q.answer,
                cq.classavgscore,cq.gradeavgscore
-        from e_paper_student_question sq left join e_rclass_question cq on sq.eptqid=cq.eptqid
+        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