修复评卷员导入和创建评卷员登录名问题；修复评卷进度完成数量及导出问题；

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

@@ -163,7 +163,7 @@ public class Marker implements Serializable {
     public void buildLoginName(int number) {
         StringBuilder name = new StringBuilder();
         name.append(examId).append(LOGINNAME_SPLITE);
-        name.append(subjectCode).append(LOGINNAME_SPLITE);
+//        name.append(subjectCode).append(LOGINNAME_SPLITE);
         name.append(number);
         setLoginName(name.toString());
     }

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

@@ -245,9 +245,11 @@ public class MarkController extends BaseParameterController {
             	list = markerService.getMarkCount(examId);
             }
             for (Marker marker : list) {
-                MarkerInfoDTO dto = new MarkerInfoDTO(marker,
-                        subjectService.find(marker.getExamId(), marker.getSubjectCode()));
-                result.add(dto);
+            	for (ExamSubject subject : marker.getExamSubjects()) {
+            		MarkerInfoDTO dto = new MarkerInfoDTO(marker,
+            				subjectService.find(marker.getExamId(), subject.getCode()));
+            		result.add(dto);
+				}
             }
 
             try {

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

@@ -125,7 +125,7 @@ public class ExamMarkerController extends BaseParameterController {
             Set<MarkerVO> markerVOs = new HashSet<MarkerVO>();
             MarkLibrarySearchQuery query2 = new MarkLibrarySearchQuery();
             query2.setExamId(examId);
-            query2.setSubjectCode(subjectCode);
+            query2.setSubjectCode(subject.getCode());
             query2.setStatus(LibraryStatus.MARKED);
             for (Marker marker : subject.getMarkers()) {
             	marker.setSubject(subject);
@@ -490,6 +490,11 @@ public class ExamMarkerController extends BaseParameterController {
             	Marker old = markerService.findByLoginName(marker.getLoginName());
             	if(old!=null){
             		marker = old;
+            	}
+            	if(examId != old.getExamId()){
+            		failureMsg.append("<br/>评卷员 " + marker.getLoginName() + "," + MarkerExcelError.MARKERED.getName());
+        			failureNum++;
+            		continue;
             	}else if(saveMap.get(marker.getLoginName())!=null){
             		marker = saveMap.get(marker.getLoginName());
             	}else{

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.mark;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -109,7 +110,11 @@ public class MarkController extends BaseController {
             modelAndView.setViewName("modules/mark/subjectSelect");
         }
         modelAndView.addObject("marker", marker);
-        modelAndView.addObject("subjectList",marker.getExamSubjects());
+        Set<ExamSubject> subjectList = marker.getExamSubjects();
+        for (ExamSubject examSubject : subjectList) {
+			
+		}
+        modelAndView.addObject("subjectList",subjectList);
 
         if (StringUtils.isNotBlank(marker.getSubjectCode())) {
             clearCurrentTask(marker);

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

@@ -29,7 +29,7 @@
 				<th>姓名</th>
 				<th>登录名</th>
 				<th>分配课程</th>
-				<th>完成课程</th>
+				<th>评阅课程</th>
 				<th>完成数量</th>
 				<th>最高分</th>
 				<th>最低分</th>