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

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

         ERrank eRrank = rranks.get(0);
         if (ranktype == 1) {//等级（A[85%~100%],B[70%~85%),C[60%~70%),D[40%~60%),E[0%~40%)）
             for (ERrank rank : rranks) {
-                Double maxrate = rank.getMaxscore();
-                Double minrate = rank.getMinscore();
+                Double maxscore = rank.getMaxscore();
+                Double minscore = rank.getMinscore();
                 String rankname = rank.getRankname();
                 if ("zf".equals(subjectid)) {
                     //总分统计
-                    double zfmaxscore = ExamUtil.mul(maxrate, pscore);
-                    double zfminscore = ExamUtil.mul(minrate, pscore);
                     ERrank rr = new ERrank();
                     rr.setRanktype(ranktype);
                     rr.setRankname(rankname);
-                    rr.setMaxscore(zfmaxscore);
-                    rr.setMinscore(zfminscore);
+                    rr.setMaxscore(maxscore);
+                    rr.setMinscore(minscore);
                     rr.setSubjectid("zf");
-                    String zfrankrange = "[" + zfminscore + "," + zfmaxscore;
+                    String zfrankrange = "[" + minscore + "," + maxscore;
                     List<ERstudent> collect;
                     if (rr.getRankname().equals("A")) {
                         zfrankrange = zfrankrange + "]";
                         collect = cstudents.stream().filter(
-                                s -> s.getScore().compareTo(zfminscore) != -1
+                                s -> s.getScore().compareTo(minscore) != -1
                         ).collect(Collectors.toList());
                     } else {
                         zfrankrange = zfrankrange + ")";
                         collect = cstudents.stream().filter(
-                                s -> s.getScore().compareTo(zfminscore) != -1 && s.getScore().compareTo(zfmaxscore) == -1
+                                s -> s.getScore().compareTo(minscore) != -1 && s.getScore().compareTo(maxscore) == -1
                         ).collect(Collectors.toList());
                     }
                     for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
                     rrank.setRanktype(ranktype);
                     rrank.setRankname(rankname);
                     rrank.setSubjectid(subjectid);
-                    double maxscore = ExamUtil.mul(maxrate, pscore);
-                    double minscore = ExamUtil.mul(minrate, pscore);
                     rrank.setMaxscore(maxscore);
                     rrank.setMinscore(minscore);
                     String rankrange = "[" + minscore + "," + maxscore;

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

         where pc.teacherid=#{teacherid} and psq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
-        ,0 classids
+        ,'' classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
         where pc.teacherid=#{teacherid} and psq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
-        ,0 classids
+        ,'' classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid

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

     </select>
     <!--学生优秀行为-->
     <select id="listGoodActionByExamId" resultType="java.util.Map">
-        select studentid,classid,subjectid
-        ,count(case when good=1 then epsqid else null end)num
-        from e_paper_student_question
+        select studentid,classid,epsq.subjectid,s.subjectname,count(epsq.epsqid)num
+        from e_paper_student_question epsq left join t_subject s on epsq.subjectid=s.subjectid
         where examid=#{examid} and good=1
         group by studentid, subjectid, good
     </select>