fixbugs

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

@@ -70,7 +70,7 @@ public class Marker implements Serializable {
     private String groupName;
 
     @Transient
-    @ExcelField(title = "登录名", align = 2, sort = 40)
+    @ExcelField(title = "用户名(登录名)", align = 2, sort = 40)
     private String loginName;
 
     @Transient

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

@@ -33,7 +33,7 @@ public class MarkerClass implements Serializable {
     private String className;
 
     @Transient
-    @ExcelField(title = "登录名", align = 2, sort = 10)
+    @ExcelField(title = "用户名(登录名)", align = 2, sort = 10)
     private String loginName;
 
     public MarkerClass(Integer userId, Integer examId, String className) {

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

@@ -28,7 +28,7 @@ public class SubjectUser implements Serializable {
     private String subjectName;
 
     @Transient
-    @ExcelField(title = "登录名", align = 2, sort = 40)
+    @ExcelField(title = "用户名(登录名)", align = 2, sort = 40)
     private String loginName;
 
     @Transient

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -225,7 +225,7 @@ public class MarkServiceImpl implements MarkService {
         // 考生整体状态与总分更新
         long groupCount = groupDao.countByExamIdAndSubjectCode(group.getExamId(), group.getSubjectCode());
         List<Integer> studentList = studentService.findIdByExamIdAndSubjectCodeAndSubjectiveStatus(group.getExamId(),
-                group.getSubjectCode(), SubjectiveStatus.MARKED, SubjectiveStatus.INSPECTED);
+                group.getSubjectCode(), SubjectiveStatus.UNMARK, SubjectiveStatus.MARKED, SubjectiveStatus.INSPECTED);
         for (Integer studentId : studentList) {
             checkStudentSubjective(studentId, groupCount);
         }

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

@@ -96,6 +96,7 @@ public class MarkController extends BaseExamController {
             mQuery.setSubjectCode(subject.getCode());
             long libraryCount = libraryService.countByQuery(mQuery);
             mQuery.addStatus(LibraryStatus.MARKED);
+            mQuery.addStatus(LibraryStatus.ARBITRATED);
             long markedCount = libraryService.countByQuery(mQuery);
             String percent = libraryCount > 0 ? (new DecimalFormat("####.###").format(markedCount * 100.0
                     / libraryCount) + "%") : "0%";

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

@@ -80,7 +80,7 @@ public class SubjectUserController extends BaseExamController {
             Integer schoolId = wu.getUser().getSchoolId();
             for (SubjectUser subjectUser : list) {
                 if (StringUtils.isBlank(subjectUser.getLoginName())) {
-                    failureMsg.append("<br/>用户 " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
+                    failureMsg.append("<br/> " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
                             + MarkerExcelError.NAMENULL.getName());
                     failureNum++;
                     continue;
@@ -89,7 +89,7 @@ public class SubjectUserController extends BaseExamController {
                 if (user == null) {
                     user = userService.findByLoginName(subjectUser.getLoginName().trim());
                     if (user != null && !schoolId.equals(user.getSchoolId())) {
-                        failureMsg.append("<br/>用户 " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
+                        failureMsg.append("<br/>用户名 " + subjectUser.getLoginName() + "," + subjectUser.getSubjectCode()
                                 + MarkerExcelError.NAMEUSED.getName());
                         failureNum++;
                         continue;

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

@@ -70,12 +70,12 @@ public class UserClassController extends BaseExamController {
             Integer schoolId = wu.getUser().getSchoolId();
             for (MarkerClass markerClass : list) {
                 if (markerClass.getExamId() == null) {
-                    failureMsg.append("<br/>用户 " + markerClass.getLoginName() + MarkerExcelError.EXAMNULL.getName());
+                    failureMsg.append("<br/>用户名 " + markerClass.getLoginName() + MarkerExcelError.EXAMNULL.getName());
                     failureNum++;
                     continue;
                 }
                 if (StringUtils.isBlank(markerClass.getClassName())) {
-                    failureMsg.append("<br/>用户 " + markerClass.getLoginName() + MarkerExcelError.CLASSNULL.getName());
+                    failureMsg.append("<br/>用户名 " + markerClass.getLoginName() + MarkerExcelError.CLASSNULL.getName());
                     failureNum++;
                     continue;
                 }
@@ -91,7 +91,7 @@ public class UserClassController extends BaseExamController {
                     continue;
                 }
                 if (StringUtils.isBlank(markerClass.getLoginName())) {
-                    failureMsg.append("<br/>用户 " + markerClass.getLoginName() + MarkerExcelError.NAMENULL.getName());
+                    failureMsg.append("<br/> " + markerClass.getLoginName() + MarkerExcelError.NAMENULL.getName());
                     failureNum++;
                     continue;
                 }
@@ -99,8 +99,8 @@ public class UserClassController extends BaseExamController {
                 if (user == null) {
                     user = userService.findByLoginName(markerClass.getLoginName().trim());
                     if (user != null && !schoolId.equals(user.getSchoolId())) {
-                        failureMsg
-                                .append("<br/>用户 " + markerClass.getLoginName() + MarkerExcelError.NAMEUSED.getName());
+                        failureMsg.append("<br/>用户名 " + markerClass.getLoginName()
+                                + MarkerExcelError.NAMEUSED.getName());
                         failureNum++;
                         continue;
                     }