Переглянути джерело

注释人工确认部分代码

ting.yin 6 роки тому
батько
коміт
70a082f028

+ 10 - 9
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreController.java

@@ -363,18 +363,19 @@ public class ScoreController extends BaseExamController {
     private String isChecked(int examId) {
         String message = null;
         Exam exam = examService.findById(examId);
-        ExamStudentSearchQuery query = new ExamStudentSearchQuery();
-        query.setExamId(examId);
-        query.setUpload(false);
-        query.setManualAbsent(false);
-        long unUploadManualAbsentCount = studentService.countByQuery(query);
+//        ExamStudentSearchQuery query = new ExamStudentSearchQuery();
+//        query.setExamId(examId);
+//        query.setUpload(false);
+//        query.setManualAbsent(false);
+//        long unUploadManualAbsentCount = studentService.countByQuery(query);
         if (exam.isNeedCalculate()) {
             message = "该考试需要统分";
-        } else if (unUploadManualAbsentCount > 0) {
-            message = "未上传考生必须人工指定缺考";
-        } else if (checkStudentService.countByExamIdAndChecked(examId, false) != 0) {
-            message = "人工确认未完成";
         } 
+//        else if (unUploadManualAbsentCount > 0) {
+//            message = "未上传考生必须人工指定缺考";
+//        } else if (checkStudentService.countByExamIdAndChecked(examId, false) != 0) {
+//            message = "人工确认未完成";
+//        } 
         return message;
     }
     

+ 14 - 14
stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/ScoreCalculateThread.java

@@ -76,7 +76,7 @@ public class ScoreCalculateThread implements Runnable {
     public void run() {
         log.info("start calculate for examId=" + examId);
         try {
-            checkStudentService.deleteByExamId(examId);
+//            checkStudentService.deleteByExamId(examId);
             int pageNumber = 1;
             int pageSize = 1000;
             List<ExamStudent> list = studentService.findByExamIdAndUploadAndAbsent(examId, true, false, pageNumber,
@@ -91,13 +91,13 @@ public class ScoreCalculateThread implements Runnable {
             }
 
             // 统计识别缺考的试卷
-            List<ExamStudent> students = studentService.findByExamIdAndUploadAndAbsent(examId, true, true, 1,
-                    Integer.MAX_VALUE);
-            for (ExamStudent examStudent : students) {
-                CheckStudent student = new CheckStudent(examStudent.getId(), examId, examStudent.getSubjectCode(),
-                        CheckType.SCAN_ABSENT);
-                checkStudentService.save(student);
-            }
+//            List<ExamStudent> students = studentService.findByExamIdAndUploadAndAbsent(examId, true, true, 1,
+//                    Integer.MAX_VALUE);
+//            for (ExamStudent examStudent : students) {
+//                CheckStudent student = new CheckStudent(examStudent.getId(), examId, examStudent.getSubjectCode(),
+//                        CheckType.SCAN_ABSENT);
+//                checkStudentService.save(student);
+//            }
             
             // 生成报表数据
             reportService.generateReportData(examId);
@@ -127,12 +127,12 @@ public class ScoreCalculateThread implements Runnable {
             markService.scoreCalculate(student.getExamId(), student.getSubjectCode(), student.getId());
 
             // 客观题0分主观题有分的考生
-            ExamSubject subject = findExamSubject(student.getSubjectCode()) ;
-            if (subject.getObjectiveScore()>0 && student.getObjectiveScore() == 0 && student.getSubjectiveScore() != 0) {
-                CheckStudent cs = new CheckStudent(student.getId(), examId, student.getSubjectCode(),
-                        CheckType.EXCEPTION);
-                checkStudentService.save(cs);
-            }
+//            ExamSubject subject = findExamSubject(student.getSubjectCode()) ;
+//            if (subject.getObjectiveScore()>0 && student.getObjectiveScore() == 0 && student.getSubjectiveScore() != 0) {
+//                CheckStudent cs = new CheckStudent(student.getId(), examId, student.getSubjectCode(),
+//                        CheckType.EXCEPTION);
+//                checkStudentService.save(cs);
+//            }
         } catch (Exception e) {
             log.error("statistic error", e);
         }

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/checkAnswer.jsp

@@ -12,7 +12,7 @@
 	    <li class="active"><a href="${ctx}/admin/exam/check/answer">识别结果检查</a></li>
 		<li><a href="${ctx}/admin/exam/check/image">图片检查</a></li>
 <%-- 		<li><a href="${ctx}/admin/exam/check/score">分数检查</a></li> --%>
-		<li><a href="${ctx}/admin/exam/check/student">人工确认</a></li>
+<%-- 		<li><a href="${ctx}/admin/exam/check/student">人工确认</a></li> --%>
 	</ul>
 	<form id="searchForm" action="${ctx}/admin/exam/check/answer/start" method="post" class="form-horizontal" target="_blank">
 	    <input type="hidden" class="hiddenField" id="examNumberIn" name="examNumberIn"/>

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/checkImage.jsp

@@ -12,7 +12,7 @@
 		<li><a href="${ctx}/admin/exam/check/answer">识别结果检查</a></li>
 		<li class="active"><a href="${ctx}/admin/exam/check/image">图片检查</a></li>
 <%-- 		<li><a href="${ctx}/admin/exam/check/score">分数检查</a></li> --%>
-		<li><a href="${ctx}/admin/exam/check/student">人工确认</a></li>
+<%-- 		<li><a href="${ctx}/admin/exam/check/student">人工确认</a></li> --%>
 	</ul>
 	<form id="searchForm" action="${ctx}/admin/exam/check/image" method="post" class="breadcrumb form-search">
 		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>