只有客观题的科目可计入统计

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

@@ -235,8 +235,10 @@ public class ReportServiceImpl implements ReportService {
     }
 
     private void statistic(ExamStudent student) {
-        if (SubjectiveStatus.MARKED.equals(student.getSubjectiveStatus())) {
-            student.setSubject(findExamSubject(student.getExamId(), student.getSubjectCode()));
+        ExamSubject subject = findExamSubject(student.getExamId(), student.getSubjectCode());
+        if (SubjectiveStatus.MARKED.equals(student.getSubjectiveStatus())
+                || (subject.getSubjectiveScore().doubleValue() == 0 && subject.getObjectiveScore() > 0)) {
+            student.setSubject(subject);
             student.setObjectiveQuestionList(findQuestionList(student.getExamId(), student.getSubjectCode(),
                     student.getPaperType(), true));
             student.setSubjectiveQuestionList(findQuestionList(student.getExamId(), student.getSubjectCode(),

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/school/service/impl/SchoolServiceImpl.java

@@ -39,7 +39,7 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
 
     @Autowired
     private SystemAuthService authService;
-    
+
     @Autowired
     private PrivilegeService privilegeService;
 
@@ -134,7 +134,7 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
     @Override
     public void updateOrg(List<School> list) {
         for (School s : list) {
-        	boolean isCreate = false;
+            boolean isCreate = false;
             School school = schoolDao.findByCode(s.getCode());
             if (school == null) {
                 school = schoolDao.findFirstByAccessKey(s.getAccessKey());
@@ -147,7 +147,7 @@ public class SchoolServiceImpl extends BaseQueryService<School> implements Schoo
                 school.setCity("");
                 school.setCode(s.getCode());
                 school.setEnable(true);
-                school.setGroupDeleteCheck(false);
+                school.setGroupDeleteCheck(true);
                 school.setDoubleTrack(false);
                 isCreate = true;
             }

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

@@ -161,6 +161,7 @@ public class UserController extends BaseExamController {
             @RequestParam(required = false) Boolean queryEnable,
             @RequestParam(required = false) MultipartFile studentFile) {
         User current = RequestUtils.getWebUser(request).getUser();
+        int examId = getSessionExamId(request);
         User previous = null;
         if (user.getId() != null) {
             previous = userService.findById(user.getId());
@@ -184,7 +185,6 @@ public class UserController extends BaseExamController {
                     subjectUserService.updateByUserId(user.getId(), getSubjectCodeSet(subjectCodeString));
                 }
                 if (user.getRole() == Role.COLLEGE_ADMIN) {
-                    int examId = getSessionExamId(request);
                     subjectUserService.updateByUserId(user.getId(),
                             getSubjectCodeSetByCollege(examId, user.getDescription()));
                     userService.save(user);
@@ -231,14 +231,16 @@ public class UserController extends BaseExamController {
             String message = validate(previous, subjectCodeString, examIdString);
             if (message == null) {
                 if (previous.getRole() == Role.SUBJECT_HEADER || user.getRole() == Role.INSPECTOR) {
+                    user.refreshAccessToken();
                     subjectUserService.updateByUserId(previous.getId(), getSubjectCodeSet(subjectCodeString));
                 }
                 if (user.getRole() == Role.SCHOOL_VIEWER) {
+                    user.refreshAccessToken();
                     userExamService.updateByUserId(user.getId(), getExamIdSet(examIdString));
                     subjectUserService.updateByUserId(previous.getId(), getSubjectCodeSet(subjectCodeString));
                 }
                 if (user.getRole() == Role.COLLEGE_ADMIN) {
-                    int examId = getSessionExamId(request);
+                    user.refreshAccessToken();
                     subjectUserService.updateByUserId(user.getId(),
                             getSubjectCodeSetByCollege(examId, user.getDescription()));
                 }

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

@@ -134,6 +134,7 @@ function goExportMarker(){
 	$("#searchForm").submit();
 	return false;
 }
+if(document.getElementById('main')!=undefined){
 var markedCount =${markedCount};
 var unMarkedCount =${unMarkedCount};
 var finishCount =${finishCount};
@@ -200,6 +201,8 @@ myChart.setOption({
         color:["#7CB5EC",'#FE8463']
     }]
 })
+}
+
 	$("#codes").change(function () {
         if ($("#codes").is(':checked')) {
             $(".codes").attr("checked", true);

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

@@ -149,9 +149,9 @@
                 for (var i = 0; i < result.length; i++) {
                     var marker = result[i];
                     $('<option value="' + marker.id + '">' + marker.loginName + '</option>').appendTo(parent);
-                    if (i == 0) {
+                    /* if (i == 0) {
                         first = marker.id;
-                    }
+                    } */
                 }
             });
             
@@ -165,9 +165,9 @@
                 for (var i = 0; i < result.length; i++) {
                     var marker = result[i];
                     $('<option value="' + marker.id + '">' + marker.loginName + '</option>').appendTo(parent);
-                    if (i == 0) {
+                    /* if (i == 0) {
                         first = marker.id;
-                    }
+                    } */
                 }
             });