Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -1,6 +1,5 @@
 package com.xhkjedu.sexam.service.report;
 
-import ch.qos.logback.core.net.SyslogOutputStream;
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
@@ -966,12 +965,14 @@ public class EReportGenerateService {
         String goalparam = "0.2";
         ERstudent rg = stuRankGoals.stream().filter(s -> s.getStudentid().equals(cs.getStudentid())
                 && s.getSubjectid().equals(cs.getSubjectid())).findFirst().orElse(null);
-        Integer goal = 0;
-        Integer nextgoal = 0;
+        Integer goal = cs.getSchoolrank();
+        Integer nextgoal = ExamUtil.getUserGroupGoalByParam(schoolrank, goalparam);
+        Integer classrankpre = 0;
         if (rg != null) {
             goal = rg.getNextgoal();
-            nextgoal = ExamUtil.getUserGroupGoalByParam(schoolrank, goalparam);
+            classrankpre = cs.getClassrank() - rg.getClassrank();
         }
+        cs.setClassrankpre(classrankpre);
         cs.setGoal(goal);
         cs.setNextgoal(nextgoal);
     }

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

@@ -17,6 +17,7 @@
         select er.allscore,er.classmaxscore,er.classminscore,er.classavgscore,er.schoolmaxscore,er.schoolavgscore
         ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc
         ,er.classid,(case when er.classid=0 then '全部班级' else ec.classname end)classname
+        ,(select s.subjectname from t_subject s where er.subjectid=s.subjectid)subjectname
         from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
         where er.examid=#{examid} and er.classid=#{classid}
     </select>

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

@@ -28,7 +28,7 @@
     </delete>
     <!--学生上次考试排名及目标-->
     <select id="listStuRankAndGoal" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
-        select er.studentid,er.subjectid,er.schoolrank,er.nextgoal
+        select er.studentid,er.subjectid,er.schoolrank,er.nextgoal,er.classrank
         from(select max(er.rsid)rsid from e_class_student ecs left join e_rstudent er on ecs.studentid = er.studentid
         where ecs.examid=#{examid} and ecs.examid!=er.examid and er.rsid is not null group by er.studentid,er.subjectid)a
         left join e_rstudent er on a.rsid=er.rsid