realityCount为有效人数，有效人数不计算缺考和违纪

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubject.java

@@ -110,9 +110,9 @@ public class ReportSubject implements Serializable {
     private Integer breachCount;
 
     /**
-     * 实考人数
+     * 有效人数
      */
-    @ExcelField(title = "实考人数", align = 2, sort = 110)
+    @ExcelField(title = "有效人数", align = 2, sort = 110)
     @Column(name = "reality_count")
     private Integer realityCount;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectGroup.java

@@ -146,7 +146,7 @@ public class ReportSubjectGroup implements Serializable {
     private Double discrimination;
 
     /**
-     * 实考人数
+     * 有效人数
      */
     @Column(name = "reality_count")
     private Integer realityCount;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectTeacher.java

@@ -58,9 +58,9 @@ public class ReportSubjectTeacher implements Serializable {
     private String teacherName;
 
     /**
-     * 实考人数
+     * 有效人数
      */
-    @ExcelField(title = "实考人数", align = 2, sort = 40)
+    @ExcelField(title = "有效人数", align = 2, sort = 40)
     @Column(name = "reality_count")
     private int realityCount;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectTeacherClass.java

@@ -65,9 +65,9 @@ public class ReportSubjectTeacherClass implements Serializable {
     private String className;
 
     /**
-     * 实考人数
+     * 有效人数
      */
-    @ExcelField(title = "实考人数", align = 2, sort = 50)
+    @ExcelField(title = "有效人数", align = 2, sort = 50)
     @Column(name = "reality_count")
     private int realityCount;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/unit/BaseCounter.java

@@ -17,7 +17,7 @@ public class BaseCounter {
         if (student.isAbsent() || !student.isUpload()) {
             absentCount++;
         }
-        if (student.isUpload() && !student.isAbsent()) {
+        if (student.isUpload() && !student.isAbsent() && !student.isBreach()) {
             realityCount++;
         }
         if (student.isBreach()) {

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

@@ -89,7 +89,7 @@ public class ReportController {
     @RequestMapping(value = "/teachAndResearch/{examId}/{subjectCode}", method = RequestMethod.GET)
     public String getSubject(Model model, HttpServletRequest request, @PathVariable Integer examId,
             @PathVariable String subjectCode) {
-        JSONObject result = getJson(examId, subjectCode, null,true);
+        JSONObject result = getJson(examId, subjectCode, null, true);
         model.addAttribute("data", result);
         return "modules/report/pdf";
     }
@@ -97,7 +97,7 @@ public class ReportController {
     @RequestMapping(value = "/teachAndResearch/{examId}/{subjectCode}/{paperType}", method = RequestMethod.GET)
     public String getSubjectByPaperType(Model model, HttpServletRequest request, @PathVariable Integer examId,
             @PathVariable String subjectCode, @PathVariable String paperType) {
-        JSONObject result = getJson(examId, subjectCode, paperType,true);
+        JSONObject result = getJson(examId, subjectCode, paperType, true);
         model.addAttribute("data", result);
         return "modules/report/pdf";
     }
@@ -105,7 +105,7 @@ public class ReportController {
     @RequestMapping(value = "/teachAndResearch/simple/{examId}/{subjectCode}", method = RequestMethod.GET)
     public String getSubjectSimple(Model model, HttpServletRequest request, @PathVariable Integer examId,
             @PathVariable String subjectCode) {
-        JSONObject result = getJson(examId, subjectCode, null,false);
+        JSONObject result = getJson(examId, subjectCode, null, false);
         model.addAttribute("data", result);
         return "modules/report/pdf";
     }
@@ -113,12 +113,12 @@ public class ReportController {
     @RequestMapping(value = "/teachAndResearch/simple/{examId}/{subjectCode}/{paperType}", method = RequestMethod.GET)
     public String getSubjectSimpleByPaperType(Model model, HttpServletRequest request, @PathVariable Integer examId,
             @PathVariable String subjectCode, @PathVariable String paperType) {
-        JSONObject result = getJson(examId, subjectCode, paperType,false);
+        JSONObject result = getJson(examId, subjectCode, paperType, false);
         model.addAttribute("data", result);
         return "modules/report/pdf";
     }
 
-    private JSONObject getJson(Integer examId, String subjectCode, String paperType,boolean isFull) {
+    private JSONObject getJson(Integer examId, String subjectCode, String paperType, boolean isFull) {
         JSONObject result = new JSONObject();
         ExamSubject subject = subjectService.find(examId, subjectCode);
         if (subject == null) {
@@ -166,8 +166,8 @@ public class ReportController {
             result.accumulate("difficulty_level",
                     getDifficulty(examId, subjectCode, paperType, reportSubject, subjectClasses, subjectGroups));
             result.accumulate("range_level", getRangeLevel(query, reportSubject, subjectClasses));
-            result.accumulate("range_10_totalScore", getRange10(reportSubject, subjectClasses,isFull));
-            result.accumulate("range_1_totalScore", getRange1(reportSubject, subjectClasses,isFull));
+            result.accumulate("range_10_totalScore", getRange10(reportSubject, subjectClasses, isFull));
+            result.accumulate("range_1_totalScore", getRange1(reportSubject, subjectClasses, isFull));
             result.accumulate("range_segment_6", getRange6(reportSubject, subjectClasses));
             return result;
         } catch (Exception e) {
@@ -237,12 +237,12 @@ public class ReportController {
         return result.toString();
     }
 
-    private String getRange1(ReportSubject subject, List<ReportSubjectClass> list,boolean isFull) {
+    private String getRange1(ReportSubject subject, List<ReportSubjectClass> list, boolean isFull) {
         JSONObject result = new JSONObject();
         result.accumulate("total",
                 getScoreRange1(subject.getScoreRange(), subject.getTotalScore(), subject.getRealityCount()));
         JSONArray classes = new JSONArray();
-        if(isFull){
+        if (isFull) {
             for (ReportSubjectClass c : list) {
                 JSONObject classValue = new JSONObject();
                 classValue.accumulate("name", c.getClassName());
@@ -255,12 +255,12 @@ public class ReportController {
         return result.toString();
     }
 
-    private String getRange10(ReportSubject subject, List<ReportSubjectClass> list,boolean isFull) {
+    private String getRange10(ReportSubject subject, List<ReportSubjectClass> list, boolean isFull) {
         JSONObject result = new JSONObject();
         result.accumulate("total",
                 getScoreRange10(subject.getScoreRange(), subject.getTotalScore(), subject.getRealityCount()));
         JSONArray classes = new JSONArray();
-        if(isFull){
+        if (isFull) {
             for (ReportSubjectClass r : list) {
                 JSONObject classValue = new JSONObject();
                 classValue.accumulate("name", r.getClassName());

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

@@ -143,7 +143,7 @@
       <table class="table table-border">
         <tr>
           <th>任课<br>老师</th>
-          <th>实考<br>人数</th>
+          <th>有效<br>人数</th>
           <th>最高分</th>
           <th>最低分</th>
           <th>及格<br>人数</th>
@@ -179,7 +179,7 @@
         <tr>
           <th>任课<br>老师</th>
           <th>班级</th>
-          <th>实考<br>人数</th>
+          <th>有效<br>人数</th>
           <th>最高分</th>
           <th>最低分</th>
           <th>及格<br>人数</th>

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

@@ -40,7 +40,7 @@
 				<th>报考人数</th>
 				<th>缺考</th>
 				<th>违纪</th>
-				<th>实考人数</th>
+				<th>有效人数</th>
 				<th>平均分</th>
 				<th>最高分</th>
 				<th>最低分</th>

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

@@ -54,7 +54,7 @@
     <thead>
     <tr>
         <th>任课老师</th>
-        <th>实考</th>
+        <th>有效人数</th>
         <th>及格</th>
         <th>优秀</th>
         <th>最高分</th>

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

@@ -32,7 +32,7 @@
     <thead>
     <tr>
         <th>班级</th>
-        <th>实考</th>
+        <th>有效人数</th>
         <th>及格</th>
         <th>优秀</th>
         <th>最高分</th>

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -556,7 +556,7 @@ CREATE TABLE `s_basic_subject` (
   `breach_count` int(11) DEFAULT NULL COMMENT '违纪人数',
   `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
   `pass_rate` double DEFAULT NULL COMMENT '及格率',
-  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `reality_count` int(11) DEFAULT NULL COMMENT '有效人数',
   `max_score` double DEFAULT NULL COMMENT '最高分',
   `min_score` double DEFAULT NULL COMMENT '最低分',
   `avg_score` double DEFAULT NULL COMMENT '平均分',
@@ -627,7 +627,7 @@ CREATE TABLE `s_basic_subject_teacher` (
   `max_score` double DEFAULT NULL COMMENT '最高分',
   `min_score` double DEFAULT NULL COMMENT '最低分',
   `avg_score` double DEFAULT NULL COMMENT '平均分',
-  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `reality_count` int(11) DEFAULT NULL COMMENT '有效人数',
   `relative_avg_score` double DEFAULT NULL COMMENT '平均相对分',
   PRIMARY KEY (`id`),
   KEY `index1` (`exam_id`,`subject_code`)
@@ -652,7 +652,7 @@ CREATE TABLE `s_basic_subject_teacher_class` (
   `max_score` double DEFAULT NULL COMMENT '最高分',
   `min_score` double DEFAULT NULL COMMENT '最低分',
   `avg_score` double DEFAULT NULL COMMENT '平均分',
-  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `reality_count` int(11) DEFAULT NULL COMMENT '有效人数',
   `relative_avg_score` double DEFAULT NULL COMMENT '平均相对分',
   PRIMARY KEY (`id`),
   KEY `index1` (`exam_id`,`subject_code`)

stmms-web/src/main/webapp/static/report-pdf/js/chart-render.js

@@ -441,7 +441,7 @@
 
   function getBarTeachersOptions(datas) {
     var xAxisData = [
-      "实考人数",
+      "有效人数",
       "最高分",
       "最低分",
       "及格人数",