修复页面统计图表显示；更新平均相对分为sql处理；修复分页问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/dao/ReportSubjectDao.java

@@ -1,13 +1,13 @@
 package cn.com.qmth.stmms.biz.report.dao;
 
-import cn.com.qmth.stmms.biz.report.model.ReportSubject;
+import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import java.util.List;
+import cn.com.qmth.stmms.biz.report.model.ReportSubject;
 
 /**
  * 课程总量分析 Dao
@@ -15,8 +15,8 @@ import java.util.List;
  * @author xuwenjin
  * @date 2019-04-12
  */
-public interface ReportSubjectDao
-        extends PagingAndSortingRepository<ReportSubject, Integer>, JpaSpecificationExecutor<ReportSubject> {
+public interface ReportSubjectDao extends PagingAndSortingRepository<ReportSubject, Integer>,
+        JpaSpecificationExecutor<ReportSubject> {
 
     @Modifying
     @Query("delete from ReportSubject r where r.examId=?1 ")
@@ -28,30 +28,15 @@ public interface ReportSubjectDao
      * @param examId
      * @return
      */
-    @Query(value = "SELECT  s.examId," +
-            "s.subjectCode," +
-            "s.subjectName," +
-            "count(s) ," +
-            "sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ," +
-            "sum( CASE WHEN s.breach = true THEN 1 ELSE 0 END ) ," +
-            "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END )  ," +
-            "max(s.objectiveScore + s.subjectiveScore) ," +
-            "min(s.objectiveScore + s.subjectiveScore) ," +
-            "avg(s.objectiveScore + s.subjectiveScore) ," +
-            "sum( CASE WHEN (s.objectiveScore + s.subjectiveScore) >= e.passScore  THEN 1 ELSE 0 END )  " +
-            "FROM " +
-            "ExamStudent s , Exam e where s.examId = e.id " +
-            "and s.examId = ?1  GROUP BY s.subjectCode, s.subjectName")
+    @Query(value = "SELECT  s.examId," + "s.subjectCode," + "s.subjectName," + "count(s) ,"
+            + "sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ,"
+            + "sum( CASE WHEN s.breach = true THEN 1 ELSE 0 END ) ,"
+            + "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END )  ,"
+            + "max(s.objectiveScore + s.subjectiveScore) ," + "min(s.objectiveScore + s.subjectiveScore) ,"
+            + "avg(s.objectiveScore + s.subjectiveScore) ,"
+            + "sum( CASE WHEN (s.objectiveScore + s.subjectiveScore) >= e.passScore  THEN 1 ELSE 0 END )  " + "FROM "
+            + "ExamStudent s , Exam e where s.examId = e.id "
+            + "and s.examId = ?1  GROUP BY s.subjectCode, s.subjectName")
     List<Object[]> queryReportSubjectData(Integer examId);
 
-    /**
-     * 查询课程平均分
-     *
-     * @param examId
-     * @param subjectCode
-     */
-    @Query(value = "select avg(s.objectiveScore + s.subjectiveScore) " +
-            "from ExamStudent s where s.examId = ?1 and s.subjectCode = ?2 ")
-    Double querySubjectAvgScore(Integer examId, String subjectCode);
-
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/dao/ReportSubjectTeacherClassDao.java

@@ -1,13 +1,13 @@
 package cn.com.qmth.stmms.biz.report.dao;
 
-import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacherClass;
+import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import java.util.List;
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacherClass;
 
 /**
  * 课程老师班级成绩分析 Dao
@@ -15,34 +15,31 @@ import java.util.List;
  * @author xuwenjin
  * @date 2019-04-17
  */
-public interface ReportSubjectTeacherClassDao
-        extends PagingAndSortingRepository<ReportSubjectTeacherClass, Integer>, JpaSpecificationExecutor<ReportSubjectTeacherClass> {
+public interface ReportSubjectTeacherClassDao extends PagingAndSortingRepository<ReportSubjectTeacherClass, Integer>,
+        JpaSpecificationExecutor<ReportSubjectTeacherClass> {
 
     @Modifying
     @Query("delete from ReportSubjectTeacherClass r where r.examId=?1 ")
     void deleteByExamId(Integer exmaId);
 
-
     /**
      * 获取课程老师班级成绩 分析数据
      *
      * @param examId
      * @param subjectCode
      */
-    @Query(value = "SELECT " +
-            "s.teacher," +
-            "s.className," +
-            "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ," +
-            "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.passScore THEN 1 ELSE 0 END ) ," +
-            "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.excellentScore THEN 1 ELSE 0 END ) ," +
-            "max( s.objectiveScore + s.subjectiveScore ) ," +
-            "min( s.objectiveScore + s.subjectiveScore ) ," +
-            "avg(s.objectiveScore + s.subjectiveScore ) " +
-            "FROM ExamStudent s , Exam e " +
-            "where s.examId = e.id " +
-            "and s.examId = ?1 " +
-            "AND s.subjectCode = ?2  and s.teacher is not null and s.className is not null " +
-            "GROUP BY s.teacher,s.className")
+    @Query(value = "SELECT " + "s.teacher," + "s.className,"
+            + "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ,"
+            + "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.passScore THEN 1 ELSE 0 END ) ,"
+            + "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.excellentScore THEN 1 ELSE 0 END ) ,"
+            + "max( s.objectiveScore + s.subjectiveScore ) ," + "min( s.objectiveScore + s.subjectiveScore ) ,"
+            + "avg(s.objectiveScore + s.subjectiveScore ) " + "FROM ExamStudent s , Exam e " + "where s.examId = e.id "
+            + "and s.examId = ?1 " + "AND s.subjectCode = ?2  and s.teacher is not null and s.className is not null "
+            + "GROUP BY s.teacher,s.className")
     List<Object[]> queryReportSubjectTeacherClassData(Integer examId, String subjectCode);
 
+    @Modifying
+    @Query("update ReportSubjectTeacherClass r set r.relativeAvgScore = (r.avgScore - (select s.avgScore from ReportSubject s where s.subjectCode = r.subjectCode and s.examId = r.examId )) where r.examId=?1  ")
+    void updateRelativeAvgScore(Integer examId);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/dao/ReportSubjectTeacherDao.java

@@ -1,13 +1,13 @@
 package cn.com.qmth.stmms.biz.report.dao;
 
-import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
+import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import java.util.List;
+import cn.com.qmth.stmms.biz.report.model.ReportSubjectTeacher;
 
 /**
  * 课程老师成绩分析 Dao
@@ -15,33 +15,32 @@ import java.util.List;
  * @author xuwenjin
  * @date 2019-04-16
  */
-public interface ReportSubjectTeacherDao
-        extends PagingAndSortingRepository<ReportSubjectTeacher, Integer>, JpaSpecificationExecutor<ReportSubjectTeacher> {
+public interface ReportSubjectTeacherDao extends PagingAndSortingRepository<ReportSubjectTeacher, Integer>,
+        JpaSpecificationExecutor<ReportSubjectTeacher> {
 
     @Modifying
     @Query("delete from ReportSubjectTeacher r where r.examId=?1 ")
     void deleteByExamId(Integer exmaId);
 
-
     /**
      * 获取课程老师分析数据
      *
-     * @param examId      考试Id
-     * @param subjectCode 课程编码
+     * @param examId
+     *            考试Id
+     * @param subjectCode
+     *            课程编码
      */
-    @Query(value = "SELECT " +
-            "s.teacher," +
-            "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ," +
-            "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.passScore THEN 1 ELSE 0 END ) ," +
-            "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.excellentScore THEN 1 ELSE 0 END ) ," +
-            "max( s.objectiveScore + s.subjectiveScore ) ," +
-            "min( s.objectiveScore + s.subjectiveScore ) ," +
-            "avg( s.objectiveScore + s.subjectiveScore ) " +
-            "FROM ExamStudent s , Exam e " +
-            "where s.examId = e.id " +
-            "and s.examId = ?1 " +
-            "AND s.subjectCode = ?2  and s.teacher is not null " +
-            "GROUP BY s.teacher")
+    @Query(value = "SELECT " + "s.teacher," + "count(s) - sum( CASE WHEN s.absent = true THEN 1 ELSE 0 END ) ,"
+            + "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.passScore THEN 1 ELSE 0 END ) ,"
+            + "sum( CASE WHEN ( s.objectiveScore + s.subjectiveScore ) >= e.excellentScore THEN 1 ELSE 0 END ) ,"
+            + "max( s.objectiveScore + s.subjectiveScore ) ," + "min( s.objectiveScore + s.subjectiveScore ) ,"
+            + "avg( s.objectiveScore + s.subjectiveScore ) " + "FROM ExamStudent s , Exam e "
+            + "where s.examId = e.id " + "and s.examId = ?1 " + "AND s.subjectCode = ?2  and s.teacher is not null "
+            + "GROUP BY s.teacher")
     List<Object[]> queryReportSubjectTeacherData(Integer examId, String subjectCode);
 
+    @Modifying
+    @Query("update ReportSubjectTeacher r set r.relativeAvgScore = (r.avgScore - (select s.avgScore from ReportSubject s where s.subjectCode = r.subjectCode and s.examId = r.examId )) where r.examId=?1  ")
+    void updateRelativeAvgScore(Integer examId);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportSubjectTeacherClassServiceImpl.java

@@ -78,30 +78,30 @@ public class ReportSubjectTeacherClassServiceImpl extends BaseQueryService<Repor
 
     @Override
     public void saveReportSubjectTeacherClassData(Integer examId, String subjectCode) {
-        ExamSubject examSubject = examSubjectDao.findByExamIdAndCode(examId, subjectCode);
-        List<Object[]> reportSubjectTeacherClassList = reportSubjectTeacherClassDao.queryReportSubjectTeacherClassData(
-                examId, subjectCode);
-        Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId, subjectCode);
-        for (Object[] rs : reportSubjectTeacherClassList) {
-            ReportSubjectTeacherClass teacherClass = new ReportSubjectTeacherClass();
-            teacherClass.setExamId(examId);
-            teacherClass.setSubjectCode(subjectCode);
-            teacherClass.setSubjectName(examSubject.getName());
-            teacherClass.setTeacherName(rs[0].toString());
-            teacherClass.setClassName(rs[1].toString());
-            teacherClass.setRealityCount(Integer.parseInt(rs[2].toString()));
-            teacherClass.setPassCount(Integer.parseInt(rs[3].toString()));
-            teacherClass.setExcellentCount(Integer.parseInt(rs[4].toString()));
-            teacherClass.setMaxScore(Double.parseDouble(rs[5].toString()));
-            teacherClass.setMinScore(Double.parseDouble(rs[6].toString()));
-            teacherClass.setPassRate(DoubleUtil.div(teacherClass.getPassCount(), teacherClass.getRealityCount(), 2));
-            teacherClass.setExcellentRate(DoubleUtil.div(teacherClass.getExcellentCount(),
-                    teacherClass.getRealityCount(), 2));
-            teacherClass.setAvgScore(DoubleUtil.format(Double.parseDouble(rs[7].toString()), "0.00"));
-            teacherClass.setRelativeAvgScore(DoubleUtil.format(Double.parseDouble(rs[7].toString()) - subjectAvgScore,
-                    "0.00"));
-            reportSubjectTeacherClassDao.save(teacherClass);
-        }
+//        ExamSubject examSubject = examSubjectDao.findByExamIdAndCode(examId, subjectCode);
+//        List<Object[]> reportSubjectTeacherClassList = reportSubjectTeacherClassDao.queryReportSubjectTeacherClassData(
+//                examId, subjectCode);
+//        Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId, subjectCode);
+//        for (Object[] rs : reportSubjectTeacherClassList) {
+//            ReportSubjectTeacherClass teacherClass = new ReportSubjectTeacherClass();
+//            teacherClass.setExamId(examId);
+//            teacherClass.setSubjectCode(subjectCode);
+//            teacherClass.setSubjectName(examSubject.getName());
+//            teacherClass.setTeacherName(rs[0].toString());
+//            teacherClass.setClassName(rs[1].toString());
+//            teacherClass.setRealityCount(Integer.parseInt(rs[2].toString()));
+//            teacherClass.setPassCount(Integer.parseInt(rs[3].toString()));
+//            teacherClass.setExcellentCount(Integer.parseInt(rs[4].toString()));
+//            teacherClass.setMaxScore(Double.parseDouble(rs[5].toString()));
+//            teacherClass.setMinScore(Double.parseDouble(rs[6].toString()));
+//            teacherClass.setPassRate(DoubleUtil.div(teacherClass.getPassCount(), teacherClass.getRealityCount(), 2));
+//            teacherClass.setExcellentRate(DoubleUtil.div(teacherClass.getExcellentCount(),
+//                    teacherClass.getRealityCount(), 2));
+//            teacherClass.setAvgScore(DoubleUtil.format(Double.parseDouble(rs[7].toString()), "0.00"));
+//            teacherClass.setRelativeAvgScore(DoubleUtil.format(Double.parseDouble(rs[7].toString()) - subjectAvgScore,
+//                    "0.00"));
+//            reportSubjectTeacherClassDao.save(teacherClass);
+//        }
     }
 
     @Override
@@ -109,18 +109,9 @@ public class ReportSubjectTeacherClassServiceImpl extends BaseQueryService<Repor
         return reportSubjectTeacherClassDao.save(r);
     }
 
+    @Transactional
     @Override
     public void updateRelativeAvgScore(Integer examId) {
-        ReportSubjectQuery query = new ReportSubjectQuery();
-        query.setExamId(examId);
-        query.setPageNumber(1);
-        query.setPageSize(Integer.MAX_VALUE);
-        List<ReportSubjectTeacherClass> list = findByQuery(query);
-        for (ReportSubjectTeacherClass reportSubjectTeacherClass : list) {
-            Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId,
-                    reportSubjectTeacherClass.getSubjectCode());
-            reportSubjectTeacherClass.setRelativeAvgScore(reportSubjectTeacherClass.getAvgScore() - subjectAvgScore);
-            reportSubjectTeacherClassDao.save(reportSubjectTeacherClass);
-        }
+        reportSubjectTeacherClassDao.updateRelativeAvgScore(examId);
     }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportSubjectTeacherServiceImpl.java

@@ -75,28 +75,28 @@ public class ReportSubjectTeacherServiceImpl extends BaseQueryService<ReportSubj
 
     @Override
     public void saveReportSubjectTeacherData(Integer examId, String subjectCode) {
-        ExamSubject examSubject = examSubjectDao.findByExamIdAndCode(examId, subjectCode);
-        List<Object[]> reportSubjectTeacherList = reportSubjectTeacherDao.queryReportSubjectTeacherData(examId,
-                subjectCode);
-        Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId, subjectCode);
-        for (Object[] rs : reportSubjectTeacherList) {
-            ReportSubjectTeacher subject = new ReportSubjectTeacher();
-            subject.setExamId(examId);
-            subject.setSubjectCode(subjectCode);
-            subject.setSubjectName(examSubject.getName());
-            subject.setTeacherName(rs[0].toString());
-            subject.setRealityCount(Integer.parseInt(rs[1].toString()));
-            subject.setPassCount(Integer.parseInt(rs[2].toString()));
-            subject.setExcellentCount(Integer.parseInt(rs[3].toString()));
-            subject.setMaxScore(Double.parseDouble(rs[4].toString()));
-            subject.setMinScore(Double.parseDouble(rs[5].toString()));
-            subject.setPassRate(DoubleUtil.div(subject.getPassCount(), subject.getRealityCount(), 2));
-            subject.setExcellentRate(DoubleUtil.div(subject.getExcellentCount(), subject.getRealityCount(), 2));
-            subject.setAvgScore(DoubleUtil.format(Double.parseDouble(rs[6].toString()), "0.00"));
-            subject.setRelativeAvgScore(DoubleUtil.format(Double.parseDouble(rs[6].toString()) - subjectAvgScore,
-                    "0.00"));
-            reportSubjectTeacherDao.save(subject);
-        }
+//        ExamSubject examSubject = examSubjectDao.findByExamIdAndCode(examId, subjectCode);
+//        List<Object[]> reportSubjectTeacherList = reportSubjectTeacherDao.queryReportSubjectTeacherData(examId,
+//                subjectCode);
+//        Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId, subjectCode);
+//        for (Object[] rs : reportSubjectTeacherList) {
+//            ReportSubjectTeacher subject = new ReportSubjectTeacher();
+//            subject.setExamId(examId);
+//            subject.setSubjectCode(subjectCode);
+//            subject.setSubjectName(examSubject.getName());
+//            subject.setTeacherName(rs[0].toString());
+//            subject.setRealityCount(Integer.parseInt(rs[1].toString()));
+//            subject.setPassCount(Integer.parseInt(rs[2].toString()));
+//            subject.setExcellentCount(Integer.parseInt(rs[3].toString()));
+//            subject.setMaxScore(Double.parseDouble(rs[4].toString()));
+//            subject.setMinScore(Double.parseDouble(rs[5].toString()));
+//            subject.setPassRate(DoubleUtil.div(subject.getPassCount(), subject.getRealityCount(), 2));
+//            subject.setExcellentRate(DoubleUtil.div(subject.getExcellentCount(), subject.getRealityCount(), 2));
+//            subject.setAvgScore(DoubleUtil.format(Double.parseDouble(rs[6].toString()), "0.00"));
+//            subject.setRelativeAvgScore(DoubleUtil.format(Double.parseDouble(rs[6].toString()) - subjectAvgScore,
+//                    "0.00"));
+//            reportSubjectTeacherDao.save(subject);
+//        }
     }
 
     @Override
@@ -104,17 +104,9 @@ public class ReportSubjectTeacherServiceImpl extends BaseQueryService<ReportSubj
         return reportSubjectTeacherDao.save(r);
     }
 
+    @Transactional
     @Override
     public void updateRelativeAvgScore(Integer examId) {
-        ReportSubjectQuery query = new ReportSubjectQuery();
-        query.setExamId(examId);
-        query.setPageNumber(1);
-        query.setPageSize(Integer.MAX_VALUE);
-        List<ReportSubjectTeacher> list = findByQuery(query);
-        for (ReportSubjectTeacher teacher : list) {
-            Double subjectAvgScore = reportSubjectDao.querySubjectAvgScore(examId, teacher.getSubjectCode());
-            teacher.setRelativeAvgScore(teacher.getAvgScore() - subjectAvgScore);
-            reportSubjectTeacherDao.save(teacher);
-        }
+        reportSubjectTeacherDao.updateRelativeAvgScore(examId);
     }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -43,6 +43,8 @@ public class ReportSubjectClassController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             List<ReportSubjectClass> reportSubjectClassList = reportSubjectClassService.findByQuery(query);
             model.addAttribute("list", reportSubjectClassList);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -42,6 +42,8 @@ public class ReportSubjectCollegeController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             List<ReportSubjectCollege> reportSubjectColleges = reportSubjectCollegeService.findByQuery(query);
             model.addAttribute("list", reportSubjectColleges);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -47,6 +47,8 @@ public class ReportSubjectGroupController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             List<ReportSubjectGroup> groups = reportSubjectGroupService.findByQuery(query);
             model.addAttribute("list", groups);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -43,6 +43,8 @@ public class ReportSubjectQuestionController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())&&query.getObjective()!=null) {
             List<ReportSubjectQuestion> questions = reportSubjectQuestionService.findByQuery(query);
             model.addAttribute("list", questions);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -48,6 +48,8 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode()) && StringUtils.isNotBlank(query.getTeacherName())) {
             List<ReportSubjectTeacherClass> reportSubjectTeacherClasses = reportSubjectTeacherClassService.findByQuery(query);
             model.addAttribute("list", reportSubjectTeacherClasses);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -41,8 +41,9 @@ public class ReportSubjectTeacherController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        // reportSubjectTeacherService.saveReportSubjectTeacherData(1,"1118802");
         query.setExamId(examId);
+        query.setPageNumber(1);
+        query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             List<ReportSubjectTeacher> reportSubjectTeacherList = reportSubjectTeacherService.findByQuery(query);
             model.addAttribute("list", reportSubjectTeacherList);

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectGroup.jsp

@@ -127,15 +127,15 @@ $('#subject-select').trigger('change');
             $(this).children('td').each(function (j) {
                 if (j == 0) {
                     groupNames.push($(this).text());
-                } else if (j == 1) {
-                    fullScores.push($(this).text());
                 } else if (j == 2) {
-                    maxScores.push($(this).text());
+                    fullScores.push($(this).text());
                 } else if (j == 3) {
-                    minScores.push($(this).text());
+                    maxScores.push($(this).text());
                 } else if (j == 4) {
-                    avgScores.push($(this).text());
+                    minScores.push($(this).text());
                 } else if (j == 5) {
+                    avgScores.push($(this).text());
+                } else if (j == 6) {
                     sds.push($(this).text());
                 }
             });

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectQuestion.jsp

@@ -113,11 +113,11 @@ $("#export-button").click(function(){
             $(this).children('td').each(function (j) {
                 if(j == 0){
                     questions.push($(this).text());
-                } else if(j == 2){
+                } else if(j == 5){
                     avgScores.push($(this).text());
-                } else if(j == 4){
+                } else if(j == 7){
                     scoreRates.push($(this).text()*100);
-                } else if(j == 5){
+                } else if(j == 8){
                     fullScoreRates.push($(this).text()*100);
                 }
             });