批量更新评卷员姓名不需要科目信息

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

@@ -45,7 +45,6 @@ public class MarkerDTO implements Serializable {
     private Double avgScore;
 
     // 课程代码
-    @ExcelField(title = "科目代码(必填)", align = 2, sort = 10)
     private String subjectCode;
 
     // 课程名称

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

@@ -3,7 +3,7 @@ package cn.com.qmth.stmms.common.enums;
 public enum MarkerExcelError {
      MARKERED("评卷员已存在",0)
     ,MARKERPWERROR("密码最少4位",1)
-    ,MARKERCODEMISS("课程代码不存在或该课程与原评卷员不匹配",2)
+   // ,MARKERCODEMISS("课程代码不存在或该课程与原评卷员不匹配",2)
     ,MARKER("通过",3)
     ,MARKERNOTINFO("EXCEL为空",4)
     ,MARKERNEWMISS("新评卷员已存在",5)

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

@@ -563,7 +563,7 @@ public class ExamMarkerController extends BaseParameterController {
                 }
             }
             for (MarkerDTO markerDTO : list) {
-                if (StringUtils.isBlank(markerDTO.getSubjectCode()) || StringUtils.isBlank(markerDTO.getLoginName())
+                if (StringUtils.isBlank(markerDTO.getLoginName())
                         || StringUtils.isBlank(markerDTO.getNewLoginName())
                         || StringUtils.isBlank(markerDTO.getPassword())) {
                     continue;
@@ -580,7 +580,7 @@ public class ExamMarkerController extends BaseParameterController {
                     marker.setPassword(markerDTO.getPassword());
                     saveList.add(marker);
                 } else {
-                    failureMsg.append("<br/>科目代码(" + markerDTO.getSubjectCode() + ")原评卷员(" + markerDTO.getLoginName()
+                    failureMsg.append("<br/>原评卷员(" + markerDTO.getLoginName()
                             + ")更换新评卷员为(" + markerDTO.getNewLoginName() + ")失败!");
                     failureMsg.append("---->失败原因：(" + markerExcelError.getName() + ")");
                     failureNum++;
@@ -611,15 +611,11 @@ public class ExamMarkerController extends BaseParameterController {
                 return MarkerExcelError.MARKERPWERROR;
             }
             if (marker != null) {
-                if (marker.getSubjectCode().equals(markerDTO.getSubjectCode())) {
                     if (markerService.countByLoginName(markerDTO.getNewLoginName()) > 0) {
                         return MarkerExcelError.MARKERNEWMISS;
                     } else {
                         return MarkerExcelError.MARKER;
                     }
-                } else {
-                    return MarkerExcelError.MARKERCODEMISS;
-                }
             } else {
                 return MarkerExcelError.MARKERMISS;
             }

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

@@ -205,7 +205,7 @@ $("#btnImport").click(function(){
     bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
 });
 $("#btnUpdateImport").click(function(){
-  $.jBox($("#importUpdateBox").html(), {title:"导入数据", buttons:{"关闭":true},
+  $.jBox($("#importUpdateBox").html(), {title:"批量修改评卷员", buttons:{"关闭":true},
     bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
 });
 $("#btnExport").click(function(){