学生报告返回平均分

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

@@ -2283,6 +2283,7 @@ public class EReportGenerateService {
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
             Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore,qgstulist.size());
 
+
             for (Map classm : classes) {
                 Integer classid = Integer.parseInt(classm.get("classid").toString());
                 List<EPaperStudentQuestion> qcstulist = qgstulist.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());

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

@@ -52,7 +52,7 @@
     <select id="listStudentExamHistory" resultType="java.util.Map">
         select e.examid,e.examdate,s.classrank,s.schoolrank
         from e_rstudent s LEFT JOIN e_base e on s.examid=e.examid
-        where s.studentid=#{studentid} and s.subjectid=#{subjectid} order by e.examdate desc limit 10
+        where s.studentid=#{studentid} and s.subjectid=#{subjectid} order by e.examdate limit 10
     </select>
 
     <!--学生报告-学科分析-学科名次-->
@@ -76,7 +76,8 @@
     </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
+        select st.qtypename,st.stuscore,st.stusrate,ct.score,ct.srate,ct.gradescore,ct.gradesrate,ct.gradeavgscore
+               ,ct.classscore,ct.classsrate,ct.classavgscore,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 and st.classid=ct.classid
         where st.examid=#{examid} and st.subjectid=#{subjectid} and st.studentid=#{studentid} order by st.erstid
@@ -84,6 +85,7 @@
     <!--学生报告-学科分析-试题分析（附件）-->
     <select id="listSubjectQuestionsForFj" resultType="java.util.Map">
         select sq.qn,sq.qorder,sq.stuscore,sq.qscore,cq.qtypename,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate
+               ,cq.gradeavgscore,cq.classavgscore
         from e_paper_student_question sq left join e_paper_student ps on sq.epsid=ps.epsid
         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
@@ -94,8 +96,10 @@
         <result property="qtypename" column="qtypename" />
         <result property="classscore" column="classscore" />
         <result property="classsrate" column="classsrate" />
+        <result property="classavgscore" column="classavgscore" />
         <result property="gradescore" column="gradescore" />
         <result property="gradesrate" column="gradesrate" />
+        <result property="gradeavgscore" column="gradeavgscore" />
         <result property="qscore" column="score" />
         <result property="epid" column="epid" />
         <result property="qn" column="qn" />
@@ -109,7 +113,7 @@
     </resultMap>
     <select id="listSubjectQuestionsForTk" resultMap="listSubjectQuesTk">
         select cq.questionid,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate,cq.qtypename,cq.score,
-        cq.epid,cq.qn,ps.studentid from e_rclass_question cq
+        cq.epid,cq.qn,ps.studentid,cq.classavgscore,cq.gradeavgscore from e_rclass_question cq
         left join e_paper_student ps on cq.epid=ps.epid and cq.classid=ps.classid
         where  cq.epid=#{epid} and ps.studentid=#{studentid} order by cq.qorder
     </select>