老师改总评

install/mysql/init/college_scan_multi.sql

@@ -201,7 +201,7 @@ CREATE TABLE `eb_exam_student` (
   `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 '老师',
+  `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

@@ -331,7 +331,7 @@ CREATE TABLE `eb_exam_student`
     `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 '老师',
+    `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 '成绩校验时间',
@@ -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,7 +1128,7 @@ 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 '老师',
+    `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 '优秀率',
@@ -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

@@ -696,7 +696,7 @@ CREATE TABLE college_scan_multi.`eb_exam_student` (
   `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 '老师',
+  `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

@@ -210,7 +210,7 @@ public class ExamStudentVo {
     private String className;
 
     /**
-     * 老师
+     * 总评
      */
     private String teacher;
 

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

@@ -269,9 +269,9 @@ public class ExamStudent implements Serializable {
     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/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/dao/ReportSubjectTeacherDao.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/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,7 +53,7 @@ public class ReportSubjectTeacherClass 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/service/impl/ReportServiceImpl.java

@@ -282,7 +282,7 @@ public class ReportServiceImpl implements ReportService {
         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(), "老师统计");
+        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/ReportSubjectTeacherClassServiceImpl.java

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

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

@@ -56,7 +56,7 @@ public class ExamStudentDTO {
     @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/ScoreController.java

@@ -168,7 +168,7 @@ public class ScoreController extends BaseExamController {
             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/ReportSubjectRangeController.java

@@ -169,8 +169,8 @@ public class ReportSubjectRangeController extends BaseExamController {
             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[] 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
@@ -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/report/ReportSubjectTeacherController.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 17:26
@@ -41,7 +41,7 @@ public class ReportSubjectTeacherController extends BaseExamController {
     @Autowired
     private ReportSubjectTeacherService reportSubjectTeacherService;
 
-    @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 ReportSubjectTeacherController extends BaseExamController {
         return "modules/report/reportSubjectTeacher";
     }
 
-    @Logging(menu = "课程老师分析导出", type = LogType.EXPORT)
+    @Logging(menu = "课程总评分析导出", type = LogType.EXPORT)
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
@@ -74,9 +74,9 @@ public class ReportSubjectTeacherController extends BaseExamController {
             r.setRelativeAvgScore(new BigDecimal(r.getRelativeAvgScore()).setScale(2, RoundingMode.HALF_UP)
                     .doubleValue());
         }
-        String fileName = "课程老师成绩分析.xlsx";
+        String fileName = "课程总评成绩分析.xlsx";
         try {
-            new ExportExcel("课程老师成绩分析", ReportSubjectTeacher.class).setDataList(list).write(response, fileName)
+            new ExportExcel("课程总评成绩分析", ReportSubjectTeacher.class).setDataList(list).write(response, fileName)
                     .dispose();
             return null;
         } catch (Exception e) {

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

@@ -69,7 +69,7 @@
         <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini"/>
         <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"/>
@@ -121,7 +121,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/exam/studentForm.jsp

@@ -52,7 +52,7 @@
         </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

@@ -108,7 +108,7 @@
         <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini studentQuery"/>
         <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"/>
@@ -179,7 +179,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/pdf.jsp

@@ -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>
@@ -142,7 +142,7 @@
     <div class="page-table <#:=pageTableClass#>">
       <table class="table table-border">
         <tr>
-          <th>任课<br>老师</th>
+          <th>任课<br>总评</th>
           <th>有效<br>人数</th>
           <th>最高分</th>
           <th>最低分</th>
@@ -173,11 +173,11 @@
   </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>任课<br>总评</th>
           <th>机组</th>
           <th>有效<br>人数</th>
           <th>最高分</th>

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

@@ -18,7 +18,7 @@
 <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/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>

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

@@ -19,7 +19,7 @@
 	<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>
-    <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/reportSubjectQuestion?subjectCode=${query.subjectCode}&objective=true" data-i18n-text="report.question.objective">客观题分析</a>

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

@@ -18,7 +18,7 @@
 	<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><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>

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

@@ -18,7 +18,7 @@
 <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/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>

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

@@ -21,7 +21,7 @@
     <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>
+           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"

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

@@ -18,7 +18,7 @@
 <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 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>
@@ -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"/>

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

@@ -210,13 +210,13 @@ report.college.passRate=\u53CA\u683C\u7387
 report.college.excellentCount=\u4F18\u79C0\u6570
 report.college.excellentRate=\u4F18\u79C0\u7387
 #report.teacher
-report.teacher=\u8001\u5E08\u5206\u6790
+report.teacher=\u603B\u8BC4\u5206\u6790
 report.teacher.subject=\u79D1\u76EE
 report.teacher.select=\u8BF7\u9009\u62E9
 report.teacher.search=\u67E5\u8BE2
 report.teacher.export=\u5BFC\u51FA
 report.teacher.chart=\u67E5\u770B\u7EDF\u8BA1\u56FE
-report.teacher.name=\u8001\u5E08
+report.teacher.name=\u603B\u8BC4
 report.teacher.realityCount=\u6709\u6548\u4EBA\u6570
 report.teacher.passCount=\u53CA\u683C
 report.teacher.excellentCount=\u4F18\u79C0

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

@@ -210,13 +210,13 @@ report.college.passRate=\u53CA\u683C\u7387
 report.college.excellentCount=\u4F18\u79C0\u6570
 report.college.excellentRate=\u4F18\u79C0\u7387
 #report.teacher
-report.teacher=\u8001\u5E08\u5206\u6790
+report.teacher=\u603B\u8BC4\u5206\u6790
 report.teacher.subject=\u79D1\u76EE
 report.teacher.select=\u8BF7\u9009\u62E9
 report.teacher.search=\u67E5\u8BE2
 report.teacher.export=\u5BFC\u51FA
 report.teacher.chart=\u67E5\u770B\u7EDF\u8BA1\u56FE
-report.teacher.name=\u8001\u5E08
+report.teacher.name=\u603B\u8BC4
 report.teacher.realityCount=\u6709\u6548\u4EBA\u6570
 report.teacher.passCount=\u53CA\u683C
 report.teacher.excellentCount=\u4F18\u79C0