文字替换

install/mysql/init/college_scan_multi.sql

@@ -199,9 +199,9 @@ CREATE TABLE `eb_exam_student` (
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',
   `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
   `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
-  `college` varchar(64) NOT NULL COMMENT '学院',
-  `class_name` varchar(64) NOT NULL COMMENT '班级',
-  `teacher` varchar(64) NOT NULL COMMENT '任课老师',
+  `college` varchar(64) NOT NULL COMMENT '电厂',
+  `class_name` varchar(64) NOT NULL COMMENT '机组',
+  `teacher` varchar(64) NOT NULL COMMENT '老师',
   `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
   PRIMARY KEY (`exam_id`,`exam_number`),
   UNIQUE KEY `auid` (`auid`),

install/mysql/init/stmms_ft.sql

@@ -328,9 +328,9 @@ CREATE TABLE `eb_exam_student`
     `subjective_score_list` text COMMENT '主观得分明细',
     `subject_level`         varchar(64)  DEFAULT NULL COMMENT '层次',
     `subject_category`      varchar(64)  DEFAULT NULL COMMENT '专业类型',
-    `college`               varchar(64) NOT NULL COMMENT '学院',
-    `class_name`            varchar(64) NOT NULL COMMENT '班级',
-    `teacher`               varchar(64) NOT NULL COMMENT '任课老师',
+    `college`               varchar(64) NOT NULL COMMENT '电厂',
+    `class_name`            varchar(64) NOT NULL COMMENT '机组',
+    `teacher`               varchar(64) NOT NULL COMMENT '老师',
     `card_number` 			int (11) 	DEFAULT NULL COMMENT '题卡号',
     `score_verify_user` 			int (11) 	DEFAULT NULL COMMENT '成绩校验人ID',
     `score_verify_time`          datetime     DEFAULT NULL COMMENT '成绩校验时间',
@@ -434,11 +434,11 @@ CREATE TABLE `eb_marker_class`
     `id`         int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
     `user_id`    int(11) NOT NULL COMMENT '用户ID',
     `exam_id`    int(11) NOT NULL COMMENT '考试ID',
-    `class_name` varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `class_name` varchar(64) DEFAULT NULL COMMENT '机组名称',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`user_id`, `exam_id`, `class_name`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='评卷员班级表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='评卷员机组表';
 
 
 # Dump of table eb_mark_group
@@ -625,10 +625,10 @@ CREATE TABLE `m_library`
     `marker_score`      double       DEFAULT NULL COMMENT '评卷总分',
     `marker_score_list` text		 DEFAULT NULL COMMENT '评卷给分明细',
     `marker_spent`      int(11)      DEFAULT NULL COMMENT '评卷时长',
-    `header_id`         int(11)      DEFAULT NULL COMMENT '科组长ID',
-    `header_time`       datetime     DEFAULT NULL COMMENT '科组长评卷时间',
-    `header_score`      double       DEFAULT NULL COMMENT '科组长总分',
-    `header_score_list` text		 DEFAULT NULL COMMENT '科组长给分明细',
+    `header_id`         int(11)      DEFAULT NULL COMMENT '评卷组长ID',
+    `header_time`       datetime     DEFAULT NULL COMMENT '评卷组长评卷时间',
+    `header_score`      double       DEFAULT NULL COMMENT '评卷组长总分',
+    `header_score_list` text		 DEFAULT NULL COMMENT '评卷组长给分明细',
     `unanswered_count`  int(11)		 DEFAULT NULL COMMENT '未作答的步骤数量',
     `reject_reason` 	varchar(128) DEFAULT NULL COMMENT '打回原因',
     PRIMARY KEY (`id`),
@@ -904,7 +904,7 @@ CREATE TABLE `s_basic_class_group`
     `exam_id`              int(11)      DEFAULT NULL COMMENT '考试ID',
     `subject_code`         varchar(32)  DEFAULT NULL COMMENT '科目代码',
     `subject_name`         varchar(32)  DEFAULT NULL COMMENT '科目名称',
-    `class_name`           varchar(64)  DEFAULT NULL COMMENT '班级名称',
+    `class_name`           varchar(64)  DEFAULT NULL COMMENT '机组名称',
     `discrimination`       double       DEFAULT NULL COMMENT '区分度',
     `objective`            tinyint(1)   DEFAULT NULL COMMENT '是否客观题',
     `group_name`           varchar(128) DEFAULT NULL COMMENT '大题名称',
@@ -918,7 +918,7 @@ CREATE TABLE `s_basic_class_group`
     `paper_type`           varchar(8)   DEFAULT NULL COMMENT '试卷类型',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='班级大题统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='机组大题统计表';
 
 
 # Dump of table s_basic_group
@@ -1042,7 +1042,7 @@ CREATE TABLE `s_basic_subject_class`
     `exam_id`              int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`         varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`         varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `class_name`           varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `class_name`           varchar(64) DEFAULT NULL COMMENT '机组名称',
     `excellent_count`      int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`       double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`           int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1062,7 +1062,7 @@ CREATE TABLE `s_basic_subject_class`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='班级统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='机组统计表';
 
 
 # Dump of table s_basic_subject_college
@@ -1075,7 +1075,7 @@ CREATE TABLE `s_basic_subject_college`
     `exam_id`         int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`    varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`    varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `college_name`    varchar(64) DEFAULT NULL COMMENT '学院名称',
+    `college_name`    varchar(64) DEFAULT NULL COMMENT '电厂名称',
 	`total_count`      	 int(11)     DEFAULT NULL COMMENT '报考人数',    
     `reality_count`      int(11)     DEFAULT NULL COMMENT '有效人数',
     `excellent_count` int(11)     DEFAULT NULL COMMENT '优秀人数',
@@ -1088,7 +1088,7 @@ CREATE TABLE `s_basic_subject_college`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='学院统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='电厂统计表';
 
 
 # Dump of table s_basic_subject_teacher
@@ -1101,7 +1101,7 @@ CREATE TABLE `s_basic_subject_teacher`
     `exam_id`            int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`       varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`       varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '任课老师',
+    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '老师',
     `excellent_count`    int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`     double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`         int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1115,7 +1115,7 @@ CREATE TABLE `s_basic_subject_teacher`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='任课老师统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='老师统计表';
 
 
 # Dump of table s_basic_subject_teacher_class
@@ -1128,8 +1128,8 @@ CREATE TABLE `s_basic_subject_teacher_class`
     `exam_id`            int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`       varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`       varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '任课老师',
-    `class_name`         varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '老师',
+    `class_name`         varchar(64) DEFAULT NULL COMMENT '机组名称',
     `excellent_count`    int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`     double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`         int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1142,7 +1142,7 @@ CREATE TABLE `s_basic_subject_teacher_class`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='任课老师班级统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='老师机组统计表';
   
 
 # Dump of table eb_import_query

install/mysql/upgrade/1.3.14.sql

@@ -369,15 +369,15 @@ CREATE TABLE `b_role_temp`
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_bin;
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SYS_ADMIN', '系统管理员', 1);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_ADMIN', '学校管理员', 2);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_ADMIN', '系统管理员', 2);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCANNER', '扫描员', 3);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SUBJECT_HEADER', '科组长', 4);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SUBJECT_HEADER', '评卷组长', 4);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('MARKER', '评卷员', 5);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_VIEWER', '学校查询员', 6);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_VIEWER', '成绩查询员', 6);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_DEV', '学校接口调用', 7);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('INSPECTOR', '复核员', 8);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCAN_ADMIN', '扫描管理员', 9);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('COLLEGE_ADMIN', '学院管理员', 10);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('COLLEGE_ADMIN', '评卷管理员', 10);
 
   
 INSERT INTO `b_role_info` (`school_id`,`code`, `name`, `seq`)
@@ -694,9 +694,9 @@ CREATE TABLE college_scan_multi.`eb_exam_student` (
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',
   `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
   `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
-  `college` varchar(64) NOT NULL COMMENT '学院',
-  `class_name` varchar(64) NOT NULL COMMENT '班级',
-  `teacher` varchar(64) NOT NULL COMMENT '任课老师',
+  `college` varchar(64) NOT NULL COMMENT '电厂',
+  `class_name` varchar(64) NOT NULL COMMENT '机组',
+  `teacher` varchar(64) NOT NULL COMMENT '老师',
   `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
   PRIMARY KEY (`exam_id`,`exam_number`),
   UNIQUE KEY `auid` (`auid`),

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/ExamStudentVo.java

@@ -199,17 +199,17 @@ public class ExamStudentVo {
     private String subjectCategory;
 
     /**
-     * 学院
+     * 电厂
      */
     private String college;
 
     /**
-     * 班级
+     * 机组
      */
     private String className;
 
     /**
-     * 任课老师
+     * 老师
      */
     private String teacher;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamStudent.java

@@ -255,23 +255,23 @@ public class ExamStudent implements Serializable {
     private String subjectCategory;
 
     /**
-     * 学院
+     * 电厂
      */
-    @ExcelField(title = "学院*", align = 2, sort = 130)
+    @ExcelField(title = "电厂*", align = 2, sort = 130)
     @Column(name = "college", length = 64, nullable = false)
     private String college;
 
     /**
-     * 班级
+     * 机组
      */
-    @ExcelField(title = "班级*", align = 2, sort = 140)
+    @ExcelField(title = "机组*", align = 2, sort = 140)
     @Column(name = "class_name", length = 64, nullable = false)
     private String className;
 
     /**
-     * 任课老师
+     * 老师
      */
-    @ExcelField(title = "任课老师*", align = 2, sort = 150)
+    @ExcelField(title = "老师*", align = 2, sort = 150)
     @Column(name = "teacher", length = 64, nullable = false)
     private String teacher;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Marker.java

@@ -95,7 +95,7 @@ public class Marker implements Serializable {
     private boolean reseting;
 
     /**
-     * 班级数量
+     * 机组数量
      */
     @Transient
     private long classCount;

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/MarkerClass.java

@@ -28,7 +28,7 @@ public class MarkerClass implements Serializable {
     @ExcelField(title = "考试ID", align = 2, sort = 20)
     private Integer examId;
 
-    @ExcelField(title = "班级", align = 2, sort = 30)
+    @ExcelField(title = "机组", align = 2, sort = 30)
     @Column(name = "class_name")
     private String className;
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/MarkLibrary.java

@@ -110,25 +110,25 @@ public class MarkLibrary implements Serializable {
     private Integer markerSpent;
 
     /**
-     * 科组长
+     * 评卷组长
      */
     @Column(name = "header_id")
     private Integer headerId;
 
     /**
-     * 科组长评卷时间
+     * 评卷组长评卷时间
      */
     @Column(name = "header_time")
     private Date headerTime;
 
     /**
-     * 科组长给分总分
+     * 评卷组长给分总分
      */
     @Column(name = "header_score")
     private Double headerScore;
 
     /**
-     * 科组长给分明细
+     * 评卷组长给分明细
      */
     @Column(name = "header_score_list")
     private String headerScoreList;

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

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 /**
- * 课程班级成绩分析 Dao
+ * 课程机组成绩分析 Dao
  *
  * @author xuwenjin
  * @date 2019-04-16

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

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 /**
- * 课程学院分析 Dao
+ * 课程电厂分析 Dao
  *
  * @author xuwenjin
  * @date 2019-04-15

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

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 /**
- * 课程老师班级成绩分析 Dao
+ * 课程老师机组成绩分析 Dao
  *
  * @author xuwenjin
  * @date 2019-04-17

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 /**
- * 课程班级成绩分析
+ * 课程机组成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-12
@@ -51,9 +51,9 @@ public class ReportSubjectClass implements Serializable {
     private String subjectName;
 
     /**
-     * 班级
+     * 机组
      */
-    @ExcelField(title = "班级", align = 2, sort = 30)
+    @ExcelField(title = "机组", align = 2, sort = 30)
     @Column(name = "class_name")
     private String className;
 

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

@@ -13,7 +13,7 @@ import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 /**
  * 
- * @Description: 班级大题分析
+ * @Description: 机组大题分析
  * @author ting.yin
  * @date 2019年6月19日
  */
@@ -51,9 +51,9 @@ public class ReportSubjectClassGroup implements Serializable {
     private String subjectName;
 
     /**
-     * 班级
+     * 机组
      */
-    @ExcelField(title = "班级", align = 2, sort = 30)
+    @ExcelField(title = "机组", align = 2, sort = 30)
     @Column(name = "class_name")
     private String className;
 

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 /**
- * 课程学院分析
+ * 课程电厂分析
  *
  * @author xuwenjin
  * @date 2019-04-11
@@ -51,9 +51,9 @@ public class ReportSubjectCollege implements Serializable {
     private String subjectName;
 
     /**
-     * 学院名称
+     * 电厂名称
      */
-    @ExcelField(title = "学院", align = 2, sort = 30)
+    @ExcelField(title = "电厂", align = 2, sort = 30)
     @Column(name = "college_name")
     private String collegeName;
 

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 /**
- * 课程任课老师成绩分析
+ * 课程老师成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-12
@@ -53,7 +53,7 @@ public class ReportSubjectTeacher implements Serializable {
     /**
      * 教师
      */
-    @ExcelField(title = "任课老师", align = 2, sort = 30)
+    @ExcelField(title = "老师", align = 2, sort = 30)
     @Column(name = "teacher_name")
     private String teacherName;
 

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 /**
- * 课程任课老师班级成绩分析
+ * 课程老师机组成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-12
@@ -53,14 +53,14 @@ public class ReportSubjectTeacherClass implements Serializable {
     /**
      * 教师
      */
-    @ExcelField(title = "任课老师", align = 2, sort = 30)
+    @ExcelField(title = "老师", align = 2, sort = 30)
     @Column(name = "teacher_name")
     private String teacherName;
 
     /**
-     * 班级
+     * 机组
      */
-    @ExcelField(title = "班级", align = 2, sort = 40)
+    @ExcelField(title = "机组", align = 2, sort = 40)
     @Column(name = "class_name")
     private String className;
 

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

@@ -6,7 +6,7 @@ import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
 import java.util.List;
 
 /**
- * 课程班级成绩分析
+ * 课程机组成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-16

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

@@ -6,7 +6,7 @@ import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
 import java.util.List;
 
 /**
- * 课程学院分析 service 接口
+ * 课程电厂分析 service 接口
  *
  * @author xuwenjin
  * @Date 2019-04-16

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

@@ -6,7 +6,7 @@ import cn.com.qmth.stmms.biz.report.query.ReportSubjectQuery;
 import java.util.List;
 
 /**
- * 课程教师班级 成绩分析
+ * 课程教师机组 成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-17

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

@@ -280,9 +280,9 @@ public class ReportServiceImpl implements ReportService {
 
     private void reoprtExcel(int examId, String subjectCode) throws IOException, Exception {
         uploadRange(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "课程分段统计");
-        uploadCollege(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "学院分析");
-        uploadClass(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "班级分析");
-        uploadTeacher(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "任课老师统计");
+        uploadCollege(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "电厂分析");
+        uploadClass(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "机组分析");
+        uploadTeacher(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "老师统计");
         uploadQuestion(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), true, "客观题分析");
         uploadQuestion(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), false, "主观题分析");
         uploadGroup(examId, subjectCode, findExamSubject(examId, subjectCode).getName(), "分组统计分析");

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

@@ -22,7 +22,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 课程班级分析 service实现
+ * 课程机组分析 service实现
  *
  * @author xuwenjin
  * @date 2019-04-16

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

@@ -21,7 +21,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 课程学院分析 service实现
+ * 课程电厂分析 service实现
  *
  * @author xuwenjin
  * @date 2019-04-16 09:43

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

@@ -21,7 +21,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 课程老师班级成绩 分析service实现
+ * 课程老师机组成绩 分析service实现
  *
  * @author xuwenjin
  * @date 2019-04-17

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

@@ -21,7 +21,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 课程学院分析 service实现
+ * 课程电厂分析 service实现
  *
  * @author xuwenjin
  * @date 2019-04-16 09:43

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassQuestionLevelModule.java

@@ -25,7 +25,7 @@ import cn.com.qmth.stmms.biz.report.utils.unit.QuestionCounter;
 import cn.com.qmth.stmms.biz.utils.SpringContextHolder;
 
 /**
- * 按科目+班级维度统计小题难度等级与区分度等级
+ * 按科目+机组维度统计小题难度等级与区分度等级
  * 
  * @author luoshi
  *

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassQuestionModule.java

@@ -10,7 +10,7 @@ import cn.com.qmth.stmms.biz.report.utils.ReportContext;
 import cn.com.qmth.stmms.biz.report.utils.unit.BaseCalculatorUnit;
 
 /**
- * 按科目+班级维度统计小题指标
+ * 按科目+机组维度统计小题指标
  * 
  * @author luoshi
  *

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/Auth.java

@@ -4,7 +4,7 @@ public enum Auth {
 
     ROLE_VIEW("角色查看"), ROLE_EDIT("修改角色"), SCHOOL_VIEW_ALL("所有学校查看"), SCHOOL_VIEW_SELF("所属学校查看"), SCHOOL_CREATE(
             "创建学校"), SCHOOL_EDIT_ALL("修改所有学校"), SCHOOL_EDIT_SELF("修改所属学校"), SCHOOL_DELETE("删除学校"), SCHOOL_ADMIN_CREATE(
-            "创建学校管理员"), SCHOOL_ADMIN_EDIT("修改学校管理员"), SCHOOL_ADMIN_DELETE("删除学校管理员"), SCHOOL_USER_VIEW(
+            "创建系统管理员"), SCHOOL_ADMIN_EDIT("修改系统管理员"), SCHOOL_ADMIN_DELETE("删除系统管理员"), SCHOOL_USER_VIEW(
             "查看学校子用户"), SCHOOL_USER_CREATE("创学校子用户"), SCHOOL_USER_EDIT("修改学校子用户"), SCHOOL_USER_DELETE(
             "删除学校子用户"), CAMPUS_VIEW_ALL("所有学习中心查看"), CAMPUS_VIEW_SELF("所属学习中心查看"), CAMPUS_CREATE("创建学习中心"), CAMPUS_EDIT_ALL(
             "修改所有学习中心"), CAMPUS_EDIT_SELF("修改所属学习中心"), CAMPUS_DELETE("删除学习中心"), CAMPUS_ADMIN_CREATE("创建学习中心管理员"), CAMPUS_ADMIN_EDIT(

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/MarkerExcelError.java

@@ -2,8 +2,8 @@ package cn.com.qmth.stmms.common.enums;
 
 public enum MarkerExcelError {
     CODENULL("课程代码不存在", 0), NAMENULL("用户名为空", 1), NAMEUSED("用户名已被其他学校占用", 2), NAMENOTMARKER("用户名已被占用,且不是评卷员类型", 3), GROUPNULL(
-            "大题号不存在", 4), EXAMNULL("考试为空", 5), CLASSNULL("班级为空", 6), EXAMCLASSNULL("考试下没有该班级", 7), NAMENOTHEADER(
-            "用户名已被占用,且不是科组长类型", 8), NAMENOTINSPECTOR("用户名已被占用,且不是复核员类型", 9);
+            "大题号不存在", 4), EXAMNULL("考试为空", 5), CLASSNULL("机组为空", 6), EXAMCLASSNULL("考试下没有该机组", 7), NAMENOTHEADER(
+            "用户名已被占用,且不是评卷组长类型", 8), NAMENOTINSPECTOR("用户名已被占用,且不是复核员类型", 9);
 
     private String name;
 

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/MarkerType.java

@@ -2,7 +2,7 @@ package cn.com.qmth.stmms.common.enums;
 
 public enum MarkerType {
 
-    MARKER("评卷员", 0), HEADER("科组长", 1);
+    MARKER("评卷员", 0), HEADER("评卷组长", 1);
 
     private String name;
 

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/Role.java

@@ -2,8 +2,8 @@ package cn.com.qmth.stmms.common.enums;
 
 public enum Role {
 
-    SYS_ADMIN("系统管理员", 1), SCHOOL_ADMIN("学校管理员", 2), SCANNER("扫描员", 3), SUBJECT_HEADER("科组长", 4), MARKER("评卷员", 5), SCHOOL_VIEWER(
-            "学校查询员", 6), SCHOOL_DEV("学校接口调用", 7), INSPECTOR("复核员", 8), SCAN_ADMIN("扫描管理员", 9), COLLEGE_ADMIN("学院管理员",
+    SYS_ADMIN("系统管理员", 1), SCHOOL_ADMIN("系统管理员", 2), SCANNER("扫描员", 3), SUBJECT_HEADER("评卷组长", 4), MARKER("评卷员", 5), SCHOOL_VIEWER(
+            "成绩查询员", 6), SCHOOL_DEV("学校接口调用", 7), INSPECTOR("复核员", 8), SCAN_ADMIN("扫描管理员", 9), COLLEGE_ADMIN("评卷管理员",
             10);
 
     private String name;

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -5,7 +5,7 @@ package cn.com.qmth.stmms.common.utils;
  */
 public class VersionInfo {
 
-    public static final String NAME = "1.3.15";
+    public static final String NAME = "1.3.16";
 
-    public static final String DATE = "20231228";
+    public static final String DATE = "20240513";
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ExamStudentDTO.java

@@ -50,13 +50,13 @@ public class ExamStudentDTO {
     @ExcelField(title = "备注", align = 2, sort = 140)
     private String remark;
 
-    @ExcelField(title = "班级", align = 2, sort = 150)
+    @ExcelField(title = "机组", align = 2, sort = 150)
     private String className;
 
-    @ExcelField(title = "学院", align = 2, sort = 160)
+    @ExcelField(title = "电厂", align = 2, sort = 160)
     private String college;
 
-    @ExcelField(title = "任课老师", align = 2, sort = 170)
+    @ExcelField(title = "老师", align = 2, sort = 170)
     private String teacher;
 
     private List<ScoreItem> objectiveList;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -222,7 +222,7 @@ public class InspectedController extends BaseExamController {
 	        int retry = 1;
 	        while (task == null) {
 	            List<ExamStudentVo> list = new ArrayList<>();
-	            // 需要判断评卷员是否绑定了班级
+	            // 需要判断评卷员是否绑定了机组
 	            query.setExamId(examId);
 	            query.setPageNumber(retry);
 	            query.setPageSize(20);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkerController.java

@@ -610,7 +610,7 @@ public class MarkerController extends BaseExamController {
         return "redirect:/admin/exam/marker";
     }
 
-    @Logging(menu = "评卷员班级绑定", type = LogType.UPDATE)
+    @Logging(menu = "评卷员机组绑定", type = LogType.UPDATE)
     @RequestMapping(value = "/class/{markerId}", method = RequestMethod.POST)
     public String classSave(@PathVariable Integer markerId, @RequestParam(required = false) String[] classes,
             Model model, RedirectAttributes redirectAttributes) {
@@ -625,7 +625,7 @@ public class MarkerController extends BaseExamController {
         return "redirect:/admin/exam/marker";
     }
 
-    @Logging(menu = "评卷员班级清空", type = LogType.DELETE)
+    @Logging(menu = "评卷员机组清空", type = LogType.DELETE)
     @RequestMapping(value = "/class/delete", method = RequestMethod.GET)
     public String classDelete(@RequestParam Integer markerId, Model model, RedirectAttributes redirectAttributes) {
         Marker marker = markerService.findById(markerId);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -156,13 +156,13 @@ public class ScoreController extends BaseExamController {
             builder.append("考场:").append(query.getExamRoom()).append(";");
         }
         if (StringUtils.isNotBlank(query.getCollege())) {
-            builder.append("学院:").append(query.getCollege()).append(";");
+            builder.append("电厂:").append(query.getCollege()).append(";");
         }
         if (StringUtils.isNotBlank(query.getClassName())) {
-            builder.append("班级:").append(query.getClassName()).append(";");
+            builder.append("机组:").append(query.getClassName()).append(";");
         }
         if (StringUtils.isNotBlank(query.getTeacher())) {
-            builder.append("任课老师:").append(query.getTeacher()).append(";");
+            builder.append("老师:").append(query.getTeacher()).append(";");
         }
         if (query.getStartScore() != null) {
             builder.append("总分从").append(query.getStartScore()).append("到").append(query.getEndScore()).append(";");

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

@@ -27,7 +27,7 @@ import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
- * 课程班级成绩分析
+ * 课程机组成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-16
@@ -41,7 +41,7 @@ public class ReportSubjectClassController extends BaseExamController {
     @Autowired
     private ReportSubjectClassService reportSubjectClassService;
 
-    @Logging(menu = "课程班级分析", type = LogType.QUERY)
+    @Logging(menu = "课程机组分析", type = LogType.QUERY)
     @RequestMapping
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
@@ -58,7 +58,7 @@ public class ReportSubjectClassController extends BaseExamController {
         return "modules/report/reportSubjectClass";
     }
 
-    @Logging(menu = "课程班级分析导出", type = LogType.EXPORT)
+    @Logging(menu = "课程机组分析导出", type = LogType.EXPORT)
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -72,9 +72,9 @@ public class ReportSubjectClassController extends BaseExamController {
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
         }
-        String fileName = "课程班级成绩分析.xlsx";
+        String fileName = "课程机组成绩分析.xlsx";
         try {
-            new ExportExcel("课程班级成绩分析", ReportSubjectClass.class).setDataList(list).write(response, fileName).dispose();
+            new ExportExcel("课程机组成绩分析", ReportSubjectClass.class).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出成绩失败！" + e.getMessage());

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

@@ -27,7 +27,7 @@ import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
- * 课程学院成绩分析
+ * 课程电厂成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-16 10:05
@@ -41,7 +41,7 @@ public class ReportSubjectCollegeController extends BaseExamController {
     @Autowired
     private ReportSubjectCollegeService reportSubjectCollegeService;
 
-    @Logging(menu = "课程学院分析", type = LogType.QUERY)
+    @Logging(menu = "课程电厂分析", type = LogType.QUERY)
     @RequestMapping
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
@@ -58,7 +58,7 @@ public class ReportSubjectCollegeController extends BaseExamController {
         return "modules/report/reportSubjectCollege";
     }
 
-    @Logging(menu = "课程班级分析导出", type = LogType.EXPORT)
+    @Logging(menu = "课程机组分析导出", type = LogType.EXPORT)
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -72,9 +72,9 @@ public class ReportSubjectCollegeController extends BaseExamController {
             r.setExcellentRate(new BigDecimal(r.getExcellentRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             r.setPassRate(new BigDecimal(r.getPassRate()).setScale(2, RoundingMode.HALF_UP).doubleValue());
         }
-        String fileName = "课程学院成绩分析.xlsx";
+        String fileName = "课程电厂成绩分析.xlsx";
         try {
-            new ExportExcel("课程学院成绩分析", ReportSubjectCollege.class).setDataList(list).write(response, fileName)
+            new ExportExcel("课程电厂成绩分析", ReportSubjectCollege.class).setDataList(list).write(response, fileName)
                     .dispose();
             return null;
         } catch (Exception e) {

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

@@ -181,12 +181,12 @@ public class ReportSubjectRangeController extends BaseExamController {
         if (fileService.reportExist(examId, subjectName, "课程分段统计", FormatType.XLSX)) {
             byte[] range = fileService.downloadReport(examId, subjectName, "课程分段统计", FormatType.XLSX);
             writer.write(new ByteArrayInputStream(range), subjectName, "课程分段统计.xlsx");
-            byte[] college = fileService.downloadReport(examId, subjectName, "学院分析", FormatType.XLSX);
-            writer.write(new ByteArrayInputStream(college), subjectName, "学院分析.xlsx");
-            byte[] className = fileService.downloadReport(examId, subjectName, "班级分析", FormatType.XLSX);
-            writer.write(new ByteArrayInputStream(className), subjectName, "班级分析.xlsx");
-            byte[] teacher = fileService.downloadReport(examId, subjectName, "任课老师统计", FormatType.XLSX);
-            writer.write(new ByteArrayInputStream(teacher), subjectName, "任课老师统计.xlsx");
+            byte[] college = fileService.downloadReport(examId, subjectName, "电厂分析", FormatType.XLSX);
+            writer.write(new ByteArrayInputStream(college), subjectName, "电厂分析.xlsx");
+            byte[] className = fileService.downloadReport(examId, subjectName, "机组分析", FormatType.XLSX);
+            writer.write(new ByteArrayInputStream(className), subjectName, "机组分析.xlsx");
+            byte[] teacher = fileService.downloadReport(examId, subjectName, "老师统计", FormatType.XLSX);
+            writer.write(new ByteArrayInputStream(teacher), subjectName, "老师统计.xlsx");
             byte[] objective = fileService.downloadReport(examId, subjectName, "客观题分析", FormatType.XLSX);
             writer.write(new ByteArrayInputStream(objective), subjectName, "客观题分析.xlsx");
             byte[] subjective = fileService.downloadReport(examId, subjectName, "主观题分析", FormatType.XLSX);

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

@@ -29,7 +29,7 @@ import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 /**
- * 课程老师班级 成绩分析
+ * 课程老师机组 成绩分析
  *
  * @author xuwenjin
  * @date 2019-04-17
@@ -46,7 +46,7 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     @Autowired
     private ExamSubjectService subjectService;
 
-    @Logging(menu = "课程教师班级分析", type = LogType.QUERY)
+    @Logging(menu = "课程教师机组分析", type = LogType.QUERY)
     @RequestMapping
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
@@ -67,7 +67,7 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
         return "modules/report/reportSubjectTeacherClass";
     }
 
-    @Logging(menu = "课程教师班级分析导出", type = LogType.EXPORT)
+    @Logging(menu = "课程教师机组分析导出", type = LogType.EXPORT)
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -83,9 +83,9 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
             r.setRelativeAvgScore(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP)
                     .doubleValue());
         }
-        String fileName = "课程老师班级成绩分析.xlsx";
+        String fileName = "课程老师机组成绩分析.xlsx";
         try {
-            new ExportExcel("课程老师班级成绩分析", ReportSubjectTeacherClass.class).setDataList(list).write(response, fileName)
+            new ExportExcel("课程老师机组成绩分析", ReportSubjectTeacherClass.class).setDataList(list).write(response, fileName)
                     .dispose();
             return null;
         } catch (Exception e) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolController.java

@@ -148,7 +148,7 @@ public class SchoolController extends BaseController {
         }
     }
 
-    @Logging(menu = "编辑学校管理员", type = LogType.UPDATE)
+    @Logging(menu = "编辑系统管理员", type = LogType.UPDATE)
     @RequestMapping(value = "/admin/save", method = RequestMethod.POST)
     public ModelAndView adminSave(HttpServletRequest request, User user) {
         School school = schoolService.findById(user.getSchoolId());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/SubjectUserController.java

@@ -58,8 +58,8 @@ public class SubjectUserController extends BaseExamController {
     public String importFileTemplate(HttpServletResponse response, @RequestParam Boolean isHeader,
             RedirectAttributes redirectAttributes) {
         try {
-            String fileName = isHeader ? "科组长数据导入模板.xlsx" : "复核员数据导入模板.xlsx";
-            String title = isHeader ? "科组长数据" : "复核员数据";
+            String fileName = isHeader ? "评卷组长数据导入模板.xlsx" : "复核员数据导入模板.xlsx";
+            String title = isHeader ? "评卷组长数据" : "复核员数据";
             List<SubjectUser> list = new ArrayList<SubjectUser>();
             list.add(new SubjectUser());
             new ExportExcel(title, SubjectUser.class, 2).setDataList(list).write(response, fileName).dispose();
@@ -70,7 +70,7 @@ public class SubjectUserController extends BaseExamController {
         return "redirect:/admin/user/list";
     }
 
-    @Logging(menu = "科组长/查询员导入", type = LogType.IMPORT_FILE)
+    @Logging(menu = "评卷组长/查询员导入", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     public String importFile(HttpServletRequest request, MultipartFile file, @RequestParam Boolean isHeader,
             RedirectAttributes redirectAttributes) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserClassController.java

@@ -48,10 +48,10 @@ public class UserClassController extends BaseExamController {
     @RequestMapping(value = "/template")
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
-            String fileName = "评卷员班级导入模板.xlsx";
+            String fileName = "评卷员机组导入模板.xlsx";
             List<MarkerClass> list = new ArrayList<MarkerClass>();
             list.add(new MarkerClass());
-            new ExportExcel("评卷员班级数据", MarkerClass.class, 2).setDataList(list).write(response, fileName).dispose();
+            new ExportExcel("评卷员机组数据", MarkerClass.class, 2).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
@@ -59,7 +59,7 @@ public class UserClassController extends BaseExamController {
         return "redirect:/admin/user/list";
     }
 
-    @Logging(menu = "评卷员班级导入", type = LogType.IMPORT_FILE)
+    @Logging(menu = "评卷员机组导入", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     public String importFile(HttpServletRequest request, MultipartFile file, RedirectAttributes redirectAttributes) {
         WebUser wu = RequestUtils.getWebUser(request);
@@ -91,7 +91,7 @@ public class UserClassController extends BaseExamController {
                     classMap.put(markerClass.getExamId(), classes);
                 }
                 if (!classes.contains(markerClass.getClassName())) {
-                    failureMsg.append("<br/>考试 " + markerClass.getExamId() + " 班级 " + markerClass.getClassName()
+                    failureMsg.append("<br/>考试 " + markerClass.getExamId() + " 机组 " + markerClass.getClassName()
                             + MarkerExcelError.EXAMCLASSNULL.getName());
                     failureNum++;
                     continue;
@@ -135,7 +135,7 @@ public class UserClassController extends BaseExamController {
             RequestUtils.setLog(request, message);
         } catch (Exception e) {
             log.error("Batch import user class error!", e);
-            addMessage(redirectAttributes, "导入用户班级失败！失败信息：" + e.getMessage());
+            addMessage(redirectAttributes, "导入用户机组失败！失败信息：" + e.getMessage());
         }
         return "redirect:/admin/user/list";
     }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -309,14 +309,14 @@ public class UserController extends BaseExamController {
         } else if (StringUtils.isBlank(user.getPassword())) {
             message = "密码不能为空";
         } else if (user.getRole() == Role.SUBJECT_HEADER && StringUtils.isBlank(subjectCodeString)) {
-            message = "科组长必须绑定科目代码";
+            message = "评卷组长必须绑定科目代码";
         } else if (user.getRole() == Role.INSPECTOR && StringUtils.isBlank(subjectCodeString)) {
             message = "复核员必须绑定科目代码";
         } else if (user.getRole() == Role.COLLEGE_ADMIN && StringUtils.isBlank(user.getDescription())) {
-            message = "学院管理员必须绑定学院";
+            message = "评卷管理员必须绑定电厂";
         } else if (user.getRole() == Role.SCHOOL_VIEWER
                 && (StringUtils.isBlank(subjectCodeString) || StringUtils.isBlank(examIdString))) {
-            message = "学校查询员必须绑定考试ID和科目代码";
+            message = "成绩查询员必须绑定考试ID和科目代码";
         }
         return message;
     }

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -489,7 +489,7 @@ public class MarkController extends BaseController {
         Task task = null;
         List<MarkLibrary> list = new ArrayList<MarkLibrary>();
         while (task == null) {
-            // 需要判断评卷员是否绑定了班级
+            // 需要判断评卷员是否绑定了机组
             Set<LibraryStatus> statusSet = new HashSet<>();
             statusSet.add(LibraryStatus.WAITING);
             statusSet.add(LibraryStatus.REJECTED);

stmms-web/src/main/java/cn/com/qmth/stmms/open/controller/OpenUserController.java

@@ -172,7 +172,7 @@ public class OpenUserController {
             return errorRedirect(redirect, returnUrl, "第三方账号已禁用");
         }
         if (user.getRole() != Role.SUBJECT_HEADER) {
-            return errorRedirect(redirect, returnUrl, "第三方账号没有科组长权限");
+            return errorRedirect(redirect, returnUrl, "第三方账号没有评卷组长权限");
         }
         user.setLastLoginTime(new Date());
         user.setLastLoginIp(RequestIPUtil.getIpAddress(request));

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

@@ -434,7 +434,7 @@ public class ReportController {
         obj.accumulate("name", "全部");
         obj.accumulate("groups", groups);
         result.add(obj);
-        // 班级
+        // 机组
         for (ReportSubjectClass reportSubjectClass : subjectClasses) {
             JSONObject classValue = new JSONObject();
             classValue.accumulate("name", reportSubjectClass.getClassName());
@@ -508,7 +508,7 @@ public class ReportController {
         obj.accumulate("name", "全部");
         obj.accumulate("groups", groups);
         result.add(obj);
-        // 班级
+        // 机组
         for (ReportSubjectClass reportSubjectClass : subjectClasses) {
             JSONObject classValue = new JSONObject();
             classValue.accumulate("name", reportSubjectClass.getClassName());

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examEdit.jsp

@@ -129,7 +129,7 @@
     </div>
 	<div id="forbiddenScoreDiv">
 	<div class="control-group" >
-        <label class="control-label">禁止科组长成绩查询</label>
+        <label class="control-label">禁止评卷组长成绩查询</label>
         <div class="controls">
             <input name="forbiddenScore" id="forbiddenScore" type="checkbox" <c:if test="${exam.forbiddenScore}">checked</c:if>/>
         </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examForm.jsp

@@ -125,7 +125,7 @@
     </div>
 	<div id="forbiddenScoreDiv">
 	<div class="control-group" >
-        <label class="control-label">禁止科组长成绩查询</label>
+        <label class="control-label">禁止评卷组长成绩查询</label>
         <div class="controls">
             <input name="forbiddenScore" id="forbiddenScore" type="checkbox" <c:if test="${exam.forbiddenScore}">checked</c:if>/>
         </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examIndex.jsp

@@ -193,7 +193,7 @@
             <%-- 			    <%@include file="/WEB-INF/views/include/picConfig.jsp" %> --%>
         </div>
         <div id="footer" class="row-fluid">
-            Copyright &copy; 2021 云阅卷 - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明泰和 v${versionName} beta${versionDate}</a>
+            <a target="_blank">v${versionName} beta${versionDate}</a>
         </div>
     </div>
 </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examSelect.jsp

@@ -65,7 +65,7 @@
         <div class="left">
             <%-- <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div> --%>
              <p>
-				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v${versionName} beta${versionDate}</a><br/>
+				<a target="_blank" style="color: rgba(255,255,255,.65)">v${versionName} beta${versionDate}</a><br/>
 				<a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
 			</p>
         </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/inspectedLibrary.jsp

@@ -68,7 +68,7 @@
                             </thead>
                             <tbody id="question-content">
                             <!-- 	                  <tr> -->
-                            <!-- 	                    <th>网络教育学院2015年下半年本科学士学位主干课程考试01</th> -->
+                            <!-- 	                    <th>网络教育电厂2015年下半年本科学士学位主干课程考试01</th> -->
                             <!-- 	                    <td>3.5</td> -->
                             <!-- 	                  </tr> -->
                             </tbody>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markerClass.jsp

@@ -2,13 +2,13 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>评卷员班级</title>
+	<title>评卷员机组</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="##">编辑班级</a></li>
+		<li class="active"><a href="##">编辑机组</a></li>
 	</ul><br/>
 	<form:form id="inputForm" action="${ctx}/admin/exam/marker/class/${marker.id }" method="post" class="form-horizontal">
 		<tags:message content="${message}"/>
@@ -19,7 +19,7 @@
 			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label">班级</label>
+			<label class="control-label">机组</label>
 			<div class="controls">
 			<c:forEach items="${classes}" var="result">
 				${result }<br/>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markerList.jsp

@@ -281,7 +281,7 @@
         <th>已评数量</th>
         <th>正在评卷</th>
         <th>任务数</th>
-        <th>绑定班级</th>
+        <th>绑定机组</th>
         <th>操作</th>
     </tr>
     </thead>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

@@ -59,11 +59,11 @@
         <label> 到&nbsp;&nbsp;&nbsp;</label>
         <input type="text" number="true" id="endScore" name="endScore" value="${query.endScore}" class="input-mini"/>
         
-        <label>学院</label>
+        <label>电厂</label>
         <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini"/>
-        <label>班级</label>
+        <label>机组</label>
         <input type="text" name="className" value="${query.className}" maxlength="64" class="input-mini"/>
-        <label>任课老师</label>
+        <label>老师</label>
         <input type="text" name="teacher" value="${query.teacher}" maxlength="64" class="input-mini"/>
         <label>考点</label>
         <input type="text" name="examSite" value="${query.examSite}" maxlength="64" class="input-mini"/>
@@ -111,9 +111,9 @@
         <th>是否缺考</th>
         <th>是否上传</th>
         <th>是否违纪</th>
-        <th>学院</th>
-        <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/exam/studentForm.jsp

@@ -40,19 +40,19 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">学院</label>
+        <label class="control-label">电厂</label>
         <div class="controls">
             <form:input path="college" htmlEscape="false" maxlength="200" class="required"/>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">班级</label>
+        <label class="control-label">机组</label>
         <div class="controls">
             <form:input path="className" htmlEscape="false" maxlength="200" class="required"/>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">任课老师</label>
+        <label class="control-label">老师</label>
         <div class="controls">
             <form:input path="teacher" htmlEscape="false" maxlength="200" class="required"/>
         </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -104,11 +104,11 @@
         <input type="text" name="packageCode" value="${query.packageCode}" maxlength="30" class="input-mini studentQuery"/>
         <label>批次编号</label>
         <input type="text" name="batchCode" value="${query.batchCode}" maxlength="30" class="input-mini studentQuery"/>
-        <label>学院</label>
+        <label>电厂</label>
         <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini studentQuery"/>
-        <label>班级</label>
+        <label>机组</label>
         <input type="text" name="className" value="${query.className}" maxlength="64" class="input-mini studentQuery"/>
-        <label>任课老师</label>
+        <label>老师</label>
         <input type="text" name="teacher" value="${query.teacher}" maxlength="64" class="input-mini studentQuery"/>
         <label>考点</label>
         <input type="text" name="examSite" value="${query.examSite}" maxlength="64" class="input-mini studentQuery"/>
@@ -177,9 +177,9 @@
         <th>人工指定</th>
         <th>批次编号</th>
         <th>签到表编号</th>
-        <th>学院</th>
-        <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/mark/reset.jsp

@@ -73,7 +73,7 @@
     <div class="middle cl">
         <div class="left">
             <%-- <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div> --%>
-            <a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)"><p>Copyright &#169 2021 启明泰和 v${versionName} beta${versionDate}</p></a>
+            <a target="_blank" style="color: rgba(255,255,255,.65)"><p>v${versionName} beta${versionDate}</p></a>
         </div>
         <div class="right">
             <div class="title">

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelect.jsp

@@ -102,7 +102,7 @@
         <div class="left">
             <%-- <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div> --%>
              <p>
-				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v${versionName} beta${versionDate}</a><br/>
+				<a target="_blank" style="color: rgba(255,255,255,.65)">v${versionName} beta${versionDate}</a><br/>
 				<a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
 			</p>
         </div>

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

@@ -99,7 +99,7 @@
     <div class="page-table <#:=pageTableClass#>">
       <table class="table table-border">
         <tr>
-          <th>班级</th>
+          <th>机组</th>
           <th>平均分</th>
           <th>最高分</th>
           <th>最低分</th>
@@ -133,7 +133,7 @@
 
   <!-- teacher-score -->
   <script id="teacher-score" type="text/html">
-    <h2 class="page-title-2">任课老师成绩分析</h2>
+    <h2 class="page-title-2">老师成绩分析</h2>
     <div class="page-chart chart-teachers" id="<#:=chartId#>" ></div>
     <#:=teacherScoreTableTpl({dataList: dataList, pageTableClass: 'teacher-table'})#>
   </script>
@@ -173,12 +173,12 @@
   </script>
   <!-- teacher-class-table -->
   <script id="teacher-class-table" type="text/html">
-    <h2 class="page-title-2">任课老师成绩分析</h2>
+    <h2 class="page-title-2">老师成绩分析</h2>
     <div class="page-table <#:=pageTableClass#>">
       <table class="table table-border">
         <tr>
           <th>任课<br>老师</th>
-          <th>班级</th>
+          <th>机组</th>
           <th>有效<br>人数</th>
           <th>最高分</th>
           <th>最低分</th>
@@ -231,7 +231,7 @@
   </script>
   <!-- college-table -->
   <script id="college-table" type="text/html">
-    <h2 class="page-title-2">学院成绩分析</h2>
+    <h2 class="page-title-2">电厂成绩分析</h2>
     <div class="page-table <#:=pageTableClass#>">
       <table class="table table-border">
         <tr>
@@ -525,7 +525,7 @@
     <div class="page-table level-table">
       <table class="table table-border">
         <tr>
-          <th>班级</th>
+          <th>机组</th>
           <th>低分段临界值</th>
           <th>高分段临界值</th>
           <th>有效卷数</th>

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

@@ -17,9 +17,9 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a></li>
-    <li class="active"><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a></li>
+    <li class="active"><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false" data-i18n-text="report.question.subjective">主观题分析</a>
@@ -37,7 +37,7 @@
                         <c:if test="${query.subjectCode eq subject.code }">selected</c:if>>${subject.code}-${subject.name}</option>
             </c:forEach>
         </select>
-        <label data-i18n-text="report.class.name">班级：</label>
+        <label data-i18n-text="report.class.name">机组：</label>
         <input type="text" name="className" value="${query.className}" maxlength="10" class="input-small"/>
         &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()" data-i18n-value="report.class.search"/>
@@ -55,7 +55,7 @@
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
     <tr>
-        <th data-i18n-text="report.class.name">班级</th>
+        <th data-i18n-text="report.class.name">机组</th>
         <th data-i18n-text="report.subject.totalCount">报考人数</th>
 		<th data-i18n-text="report.subject.realityCount">有效人数</th>
         <th data-i18n-text="report.class.avgScore">平均分</th>

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

@@ -17,11 +17,11 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li class="active"><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a>
+    <li class="active"><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a>
     </li>
-    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a>
     </li>
-    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false" data-i18n-text="report.question.subjective">主观题分析</a>
@@ -40,7 +40,7 @@
             </c:forEach>
         </select>
         &nbsp;
-        <label data-i18n-text="report.college.name">学院：</label>
+        <label data-i18n-text="report.college.name">电厂：</label>
         <input type="text" name="collegeName" value="${query.collegeName}" maxlength="10" class="input-small"/>
         &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()" data-i18n-value="report.college.search"/>

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

@@ -16,11 +16,11 @@
 </head>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a>
     </li>
-    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a>
     </li>
-    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false" data-i18n-text="report.question.subjective">主观题分析</a>

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

@@ -17,9 +17,9 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li id="objectiveLi"><a
             href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>

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

@@ -18,9 +18,9 @@
 <body>
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false" data-i18n-text="report.question.subjective">主观题分析</a>

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

@@ -17,9 +17,9 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/admin/exam/reportSubjectRange">分段统计</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">学院分析</a></li>
-    <li class="active"><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">任课老师分析</a></li>
-    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">班级分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${query.subjectCode}" data-i18n-text="report.college">电厂分析</a></li>
+    <li class="active"><a href="${ctx}/admin/exam/reportSubjectTeacher?subjectCode=${query.subjectCode}" data-i18n-text="report.teacher">老师分析</a></li>
+    <li><a href="${ctx}/admin/exam/reportSubjectClass?subjectCode=${query.subjectCode}" data-i18n-text="report.class">机组分析</a></li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>
     </li>
     <li><a href="${ctx}/admin/exam/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=false" data-i18n-text="report.question.subjective">主观题分析</a>
@@ -37,7 +37,7 @@
                         <c:if test="${query.subjectCode eq subject.code }">selected</c:if>>${subject.code}-${subject.name}</option>
             </c:forEach>
         </select>
-        <label data-i18n-text="report.teacher.name">任课老师：</label>
+        <label data-i18n-text="report.teacher.name">老师：</label>
         <input type="text" name="teacherName"  id="teacherName" value="${query.teacherName}" maxlength="10" class="input-small"/>
        &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"  data-i18n-value="report.teacher.search"/>
@@ -55,7 +55,7 @@
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
     <tr>
-        <th data-i18n-text="report.teacher.name">任课老师</th>
+        <th data-i18n-text="report.teacher.name">老师</th>
 		<th data-i18n-text="report.subject.totalCount">报考人数</th>
         <th data-i18n-text="report.teacher.realityCount">有效人数</th>
         <th data-i18n-text="report.teacher.passCount">及格</th>

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

@@ -16,13 +16,13 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="#" data-i18n-text="report.teacher">任课老师班级分析</a></li>
+    <li class="active"><a href="#" data-i18n-text="report.teacher">老师机组分析</a></li>
 </ul>
 <form id="searchForm" action="${ctx}/admin/exam/reportSubjectTeacher" method="post" class="breadcrumb form-search">
 		<input type="hidden" id="teacherName" name="teacherName" value="${query.teacherName }"/>
 		<input type="hidden" id="subjectCode" name="subjectCode" value="${query.subjectCode }"/>
     &nbsp;&nbsp;<span data-i18n-text="report.teacher.subject">科目</span>：${subjectName}&nbsp;&nbsp;&nbsp;&nbsp;
-    <span data-i18n-text="report.teacher.name">任课老师</span>：${query.teacherName} &nbsp;&nbsp;
+    <span data-i18n-text="report.teacher.name">老师</span>：${query.teacherName} &nbsp;&nbsp;
     <a href="#" class="btn btn-primary" onclick="viewTeacherClassEcharts()" data-i18n-text="report.teacher.chart">查看统计图</a>
     &nbsp;
 	<!-- <input id="export-button" class="btn" type="button" value="导出" data-i18n-value="report.teacher.export"/>
@@ -33,7 +33,7 @@
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
     <tr>
-        <th data-i18n-text="report.class.name">班级</th>
+        <th data-i18n-text="report.class.name">机组</th>
         <th data-i18n-text="report.teacher.realityCount">有效人数</th>
         <th data-i18n-text="report.teacher.passCount">及格</th>
         <th data-i18n-text="report.teacher.excellentCount">优秀</th>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -34,13 +34,13 @@
                     src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/>
             </div> --%>
             <p>
-				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v${versionName} beta${versionDate}</a><br/>
+				<a target="_blank" style="color: rgba(255,255,255,.65)">v${versionName} beta${versionDate}</a><br/>
 				<a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
 			</p>
         </div>
         <div class="right">
             <div class="title">
-                <h1 data-i18n-text="user.login.title">高校考试管理平台</h1>
+                <h1 data-i18n-text="user.login.title">阅卷平台登录</h1>
                 <%-- <c:if test="${loginType == 'admin-login' }"><p data-i18n-text="user.login.admin">管理员登录</p></c:if> --%>
                 <c:if test="${loginType == 'mark-login-only' }"><p data-i18n-text="user.login.marker">评卷员登录</p></c:if>
                 <c:if test="${loginType != 'mark-login-only' }">

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/reset.jsp

@@ -74,7 +74,7 @@
         <div class="left">
             <%-- <div class="logo"><img src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/></div> --%>
              <p>
-				<a href="http://www.qmth.com.cn" target="_blank" style="color: rgba(255,255,255,.65)">Copyright &#169 2021 启明泰和 v${versionName} beta${versionDate}</a><br/>
+				<a target="_blank" style="color: rgba(255,255,255,.65)">v${versionName} beta${versionDate}</a><br/>
 				<a href="https://beian.miit.gov.cn/" target="_blank" style="color: rgba(255,255,255,.65)">鄂ICP备12000033号-3</a>
 			</p>
         </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/schoolAdminEdit.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>学校管理员</title>
+	<title>系统管理员</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 	<script type="text/javascript">

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp

@@ -104,7 +104,7 @@
 				</div>
 			</div>
 		    <div id="footer" class="row-fluid">
-	            Copyright &copy; 2021 云阅卷 - Powered By <a href="http://www.qmth.com.cn" target="_blank">启明泰和 v${versionName} beta${versionDate}</a>
+	           <a target="_blank">v${versionName} beta${versionDate}</a>
 			</div>
 		</div>
 	</div>

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userEdit.jsp

@@ -153,7 +153,7 @@ enctype="multipart/form-data" class="form-horizontal">
     </c:if>
     <c:if test="${user.role==null || user.role.value==10}">
         <div class="control-group" id="college-div">
-            <label class="control-label">绑定学院</label>
+            <label class="control-label">绑定电厂</label>
             <div class="controls">
             <textarea name="description" rows="4" class="input-xxlarge"
                       >${user.description}</textarea>

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -88,12 +88,12 @@
                     导入<span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu">
-                    <li><a href="##" id="btnImport">科组长</a></li>
+                    <li><a href="##" id="btnImport">评卷组长</a></li>
                     <li><a href="##" id="btnImportInspector">复核员</a></li>
                 </ul>
             </div>
             &nbsp;
-            <input id="btnImportClass" class="btn" type="button" value="导入评卷员班级"/>
+            <input id="btnImportClass" class="btn" type="button" value="导入评卷员机组"/>
             &nbsp;
             <div class="btn-group">
 				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -271,7 +271,7 @@
         return false;
     }
     $("#btnImport").click(function(){
-    	  $.jBox($("#importBox").html(), {title:"导入科组长", buttons:{"关闭":true},
+    	  $.jBox($("#importBox").html(), {title:"导入评卷组长", buttons:{"关闭":true},
     	    bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
     });
     $("#btnImportInspector").click(function(){
@@ -279,7 +279,7 @@
   	    bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
   });
     $("#btnImportClass").click(function(){
-  	  $.jBox($("#importClassBox").html(), {title:"导入评卷员班级", buttons:{"关闭":true},
+  	  $.jBox($("#importClassBox").html(), {title:"导入评卷员机组", buttons:{"关闭":true},
   	    bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
   });
     function goExport() {

stmms-web/src/main/webapp/index.html

@@ -12,7 +12,7 @@
 <div class="marking-header">
   <p class="logo fl"><a href="http://www.markingcloud.com"><img src="http://static.qmth.com.cn/markingcloud/images/logo.png" /></a></p>
   <span class="fr mr-r">
-  <a class="nav" href="mark-login">评卷员/科组长入口</a>
+  <a class="nav" href="mark-login">评卷员/评卷组长入口</a>
   <a href="#" class="nav">|</a>
   <a class="nav" href="admin-login">管理员入口</a>
   </span>

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

@@ -199,9 +199,9 @@ CREATE TABLE `eb_exam_student` (
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',
   `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
   `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
-  `college` varchar(64) NOT NULL COMMENT '学院',
-  `class_name` varchar(64) NOT NULL COMMENT '班级',
-  `teacher` varchar(64) NOT NULL COMMENT '任课老师',
+  `college` varchar(64) NOT NULL COMMENT '电厂',
+  `class_name` varchar(64) NOT NULL COMMENT '机组',
+  `teacher` varchar(64) NOT NULL COMMENT '老师',
   `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
   PRIMARY KEY (`exam_id`,`exam_number`),
   UNIQUE KEY `auid` (`auid`),

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

@@ -328,9 +328,9 @@ CREATE TABLE `eb_exam_student`
     `subjective_score_list` text COMMENT '主观得分明细',
     `subject_level`         varchar(64)  DEFAULT NULL COMMENT '层次',
     `subject_category`      varchar(64)  DEFAULT NULL COMMENT '专业类型',
-    `college`               varchar(64) NOT NULL COMMENT '学院',
-    `class_name`            varchar(64) NOT NULL COMMENT '班级',
-    `teacher`               varchar(64) NOT NULL COMMENT '任课老师',
+    `college`               varchar(64) NOT NULL COMMENT '电厂',
+    `class_name`            varchar(64) NOT NULL COMMENT '机组',
+    `teacher`               varchar(64) NOT NULL COMMENT '老师',
     `card_number` 			int (11) 	DEFAULT NULL COMMENT '题卡号',
     `score_verify_user` 			int (11) 	DEFAULT NULL COMMENT '成绩校验人ID',
     `score_verify_time`          datetime     DEFAULT NULL COMMENT '成绩校验时间',
@@ -434,11 +434,11 @@ CREATE TABLE `eb_marker_class`
     `id`         int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
     `user_id`    int(11) NOT NULL COMMENT '用户ID',
     `exam_id`    int(11) NOT NULL COMMENT '考试ID',
-    `class_name` varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `class_name` varchar(64) DEFAULT NULL COMMENT '机组名称',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`user_id`, `exam_id`, `class_name`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='评卷员班级表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='评卷员机组表';
 
 
 # Dump of table eb_mark_group
@@ -624,10 +624,10 @@ CREATE TABLE `m_library`
     `marker_score`      double       DEFAULT NULL COMMENT '评卷总分',
     `marker_score_list` text		 DEFAULT NULL COMMENT '评卷给分明细',
     `marker_spent`      int(11)      DEFAULT NULL COMMENT '评卷时长',
-    `header_id`         int(11)      DEFAULT NULL COMMENT '科组长ID',
-    `header_time`       datetime     DEFAULT NULL COMMENT '科组长评卷时间',
-    `header_score`      double       DEFAULT NULL COMMENT '科组长总分',
-    `header_score_list` text		 DEFAULT NULL COMMENT '科组长给分明细',
+    `header_id`         int(11)      DEFAULT NULL COMMENT '评卷组长ID',
+    `header_time`       datetime     DEFAULT NULL COMMENT '评卷组长评卷时间',
+    `header_score`      double       DEFAULT NULL COMMENT '评卷组长总分',
+    `header_score_list` text		 DEFAULT NULL COMMENT '评卷组长给分明细',
     `unanswered_count`  int(11)		 DEFAULT NULL COMMENT '未作答的步骤数量',
     `reject_reason` 	varchar(128) DEFAULT NULL COMMENT '打回原因',
     PRIMARY KEY (`id`),
@@ -902,7 +902,7 @@ CREATE TABLE `s_basic_class_group`
     `exam_id`              int(11)      DEFAULT NULL COMMENT '考试ID',
     `subject_code`         varchar(32)  DEFAULT NULL COMMENT '科目代码',
     `subject_name`         varchar(32)  DEFAULT NULL COMMENT '科目名称',
-    `class_name`           varchar(64)  DEFAULT NULL COMMENT '班级名称',
+    `class_name`           varchar(64)  DEFAULT NULL COMMENT '机组名称',
     `discrimination`       double       DEFAULT NULL COMMENT '区分度',
     `objective`            tinyint(1)   DEFAULT NULL COMMENT '是否客观题',
     `group_name`           varchar(128) DEFAULT NULL COMMENT '大题名称',
@@ -916,7 +916,7 @@ CREATE TABLE `s_basic_class_group`
     `paper_type`           varchar(8)   DEFAULT NULL COMMENT '试卷类型',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='班级大题统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='机组大题统计表';
 
 
 # Dump of table s_basic_group
@@ -1040,7 +1040,7 @@ CREATE TABLE `s_basic_subject_class`
     `exam_id`              int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`         varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`         varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `class_name`           varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `class_name`           varchar(64) DEFAULT NULL COMMENT '机组名称',
     `excellent_count`      int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`       double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`           int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1060,7 +1060,7 @@ CREATE TABLE `s_basic_subject_class`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='班级统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='机组统计表';
 
 
 # Dump of table s_basic_subject_college
@@ -1073,7 +1073,7 @@ CREATE TABLE `s_basic_subject_college`
     `exam_id`         int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`    varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`    varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `college_name`    varchar(64) DEFAULT NULL COMMENT '学院名称',
+    `college_name`    varchar(64) DEFAULT NULL COMMENT '电厂名称',
 	`total_count`      	 int(11)     DEFAULT NULL COMMENT '报考人数',    
     `reality_count`      int(11)     DEFAULT NULL COMMENT '有效人数',
     `excellent_count` int(11)     DEFAULT NULL COMMENT '优秀人数',
@@ -1086,7 +1086,7 @@ CREATE TABLE `s_basic_subject_college`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='学院统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='电厂统计表';
 
 
 # Dump of table s_basic_subject_teacher
@@ -1099,7 +1099,7 @@ CREATE TABLE `s_basic_subject_teacher`
     `exam_id`            int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`       varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`       varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '任课老师',
+    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '老师',
     `excellent_count`    int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`     double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`         int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1113,7 +1113,7 @@ CREATE TABLE `s_basic_subject_teacher`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='任课老师统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='老师统计表';
 
 
 # Dump of table s_basic_subject_teacher_class
@@ -1126,8 +1126,8 @@ CREATE TABLE `s_basic_subject_teacher_class`
     `exam_id`            int(11)     DEFAULT NULL COMMENT '考试ID',
     `subject_code`       varchar(32) DEFAULT NULL COMMENT '科目代码',
     `subject_name`       varchar(32) DEFAULT NULL COMMENT '科目名称',
-    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '任课老师',
-    `class_name`         varchar(64) DEFAULT NULL COMMENT '班级名称',
+    `teacher_name`       varchar(64) DEFAULT NULL COMMENT '老师',
+    `class_name`         varchar(64) DEFAULT NULL COMMENT '机组名称',
     `excellent_count`    int(11)     DEFAULT NULL COMMENT '优秀人数',
     `excellent_rate`     double      DEFAULT NULL COMMENT '优秀率',
     `pass_count`         int(11)     DEFAULT NULL COMMENT '及格人数',
@@ -1140,7 +1140,7 @@ CREATE TABLE `s_basic_subject_teacher_class`
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='任课老师班级统计表';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='老师机组统计表';
   
 
 # Dump of table eb_import_query

stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -369,15 +369,15 @@ CREATE TABLE `b_role_temp`
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_bin;
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SYS_ADMIN', '系统管理员', 1);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_ADMIN', '学校管理员', 2);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_ADMIN', '系统管理员', 2);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCANNER', '扫描员', 3);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SUBJECT_HEADER', '科组长', 4);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SUBJECT_HEADER', '评卷组长', 4);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('MARKER', '评卷员', 5);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_VIEWER', '学校查询员', 6);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_VIEWER', '成绩查询员', 6);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCHOOL_DEV', '学校接口调用', 7);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('INSPECTOR', '复核员', 8);
 INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('SCAN_ADMIN', '扫描管理员', 9);
-INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('COLLEGE_ADMIN', '学院管理员', 10);
+INSERT INTO `b_role_temp` (`code`, `name`, `seq`) VALUES ('COLLEGE_ADMIN', '评卷管理员', 10);
 
   
 INSERT INTO `b_role_info` (`school_id`,`code`, `name`, `seq`)
@@ -694,9 +694,9 @@ CREATE TABLE college_scan_multi.`eb_exam_student` (
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',
   `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
   `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
-  `college` varchar(64) NOT NULL COMMENT '学院',
-  `class_name` varchar(64) NOT NULL COMMENT '班级',
-  `teacher` varchar(64) NOT NULL COMMENT '任课老师',
+  `college` varchar(64) NOT NULL COMMENT '电厂',
+  `class_name` varchar(64) NOT NULL COMMENT '机组',
+  `teacher` varchar(64) NOT NULL COMMENT '老师',
   `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
   PRIMARY KEY (`exam_id`,`exam_number`),
   UNIQUE KEY `auid` (`auid`),

stmms-web/src/main/webapp/static/i18n/messages_zh.properties

@@ -1,5 +1,5 @@
 #login
-user.login.title=\u9ad8\u6821\u8003\u8bd5\u7ba1\u7406\u5e73\u53f0
+user.login.title=\u9605\u5377\u5e73\u53f0\u767b\u5f55
 user.login.admin=\u7ba1\u7406\u5458\u767b\u5f55
 user.login.marker=\u8bc4\u5377\u5458\u767b\u5f55
 user.login.name=\u8d26\u53f7

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

@@ -548,7 +548,7 @@
   }
 
   function getBarTeacherGradeOptions(datas) {
-    var title = datas.name + "_任课班级成绩分析";
+    var title = datas.name + "_任课机组成绩分析";
     var symbolCircle =
       "path://M16,9.2c-3.8,0-6.8,3.1-6.8,6.8s3.1,6.8,6.8,6.8s6.8-3.1,6.8-6.8S19.8,9.2,16,9.2z M29.7,16  c0,7.6-6.1,13.7-13.7,13.7S2.3,23.6,2.3,16S8.4,2.3,16,2.3S29.7,8.4,29.7,16z";
     var classes = datas.classes;

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

@@ -1600,7 +1600,7 @@ var dataStatic = {
 		}]
 	}],
 	"basic_college": [{
-		"name": "学院1",
+		"name": "电厂1",
 		"maxScore": 96,
 		"minScore": 10,
 		"avgScore": 51.77092511013216,

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

@@ -47,17 +47,17 @@ function build() {
     "barPointTopic"
   );
 
-  // 班级成绩分析
-  createTableList(datas.basic_class, 32, "班级成绩分析", "classes-table");
-  createBarPointChart(datas.basic_class, 22, "班级成绩分析", "barPointGrade");
+  // 机组成绩分析
+  createTableList(datas.basic_class, 32, "机组成绩分析", "classes-table");
+  createBarPointChart(datas.basic_class, 22, "机组成绩分析", "barPointGrade");
 
-  // 任课老师成绩分析
+  // 老师成绩分析
   createTeacherScore(datas.basic_teacher);
   createTeacherGrade(datas.basic_teacher);
 
-  // 学院成绩分析;
-  createTableList(datas.basic_college, 32, "学院成绩分析", "college-table");
-  createBarPointChart(datas.basic_college, 22, "学院成绩分析", "barPointGrade");
+  // 电厂成绩分析;
+  createTableList(datas.basic_college, 32, "电厂成绩分析", "college-table");
+  createBarPointChart(datas.basic_college, 22, "电厂成绩分析", "barPointGrade");
 
   // 大题难度分析
   createLineChart(datas.basic_main_question);
@@ -120,7 +120,7 @@ function createCover(cover) {
   $bodyMain.append($dom);
 }
 
-// 题型成绩分析，班级成绩分析，学院成绩分析, 题目难度
+// 题型成绩分析，机组成绩分析，电厂成绩分析, 题目难度
 function createTableList(dataList, splitRange, title, tableType) {
   var hTmpl = $("#" + tableType).html();
   sectionArr(dataList, splitRange).forEach(function(item) {
@@ -133,7 +133,7 @@ function createTableList(dataList, splitRange, title, tableType) {
   });
 }
 
-// 题型成绩分析，班级成绩分析，学院成绩分析
+// 题型成绩分析，机组成绩分析，电厂成绩分析
 function createBarPointChart(dataList, splitRange, title, chartType) {
   var hTmpl = $("#page-chart").html();
   var labelHeight = Math.round(1170 / splitRange);
@@ -153,7 +153,7 @@ function createBarPointChart(dataList, splitRange, title, chartType) {
   });
 }
 
-// 任课老师成绩分析
+// 老师成绩分析
 function createTeacherScore(dataList) {
   var hTmpl = $("#teacher-score").html();
   var splitList = sectionArr(dataList, 6);
@@ -183,7 +183,7 @@ function createTeacherScore(dataList) {
     });
   }
 }
-// 任课老师班级成绩分析
+// 老师机组成绩分析
 function createTeacherGrade(dataList) {
   var hTmpl = $("#teacher-grade").html();
   var sectionDataList = [];
@@ -336,7 +336,7 @@ function createRange10TotalScore(datas) {
       dataList: datas.total
     });
   }
-  // 班级成绩频率分布
+  // 机组成绩频率分布
   pageList = pageList.concat(
     datas.classes.map(function(item) {
       return {
@@ -381,7 +381,7 @@ function createRangeTotalScore(datas) {
       dataList: datas.total
     });
   }
-  // 班级成绩统计
+  // 机组成绩统计
   pageList = pageList.concat(
     datas.classes.map(function(item) {
       return {