ting.yin 2 years ago
parent
commit
7ec60f6d28

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

@@ -277,7 +277,6 @@ public class MarkServiceImpl implements MarkService {
         if (groupCount == 0 || unGroupQuestionCount > 0) {
             studentService.updateSubjectiveStatusAndScoreAndInspectorId(group.getExamId(), group.getSubjectCode(),
                     SubjectiveStatus.UNMARK, 0, null, null, null);
-            subjectService.updateTrialCount(group.getExamId(), group.getSubjectCode(), 0);
         } else {
             List<Integer> studentList = studentService.findIdByExamIdAndSubjectCodeAndSubjectiveStatus(
                     group.getExamId(), group.getSubjectCode(), SubjectiveStatus.UNMARK, SubjectiveStatus.MARKED,

+ 3 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

@@ -106,9 +106,9 @@ public class LibraryController extends BaseExamController {
         query.setExamId(examId);
         if (status != null) {
             query.addStatus(status);
-            if (status != LibraryStatus.REJECTED) {
-                query.setRejectReason(null);
-            }
+        }
+        if (status != LibraryStatus.REJECTED) {
+            query.setRejectReason(null);
         }
         if (StringUtils.isEmpty(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());

+ 4 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -744,6 +744,10 @@ public class PaperController extends BaseExamController {
             questionService.save(question);
             subjectService.updateScore(examId, question.getSubjectCode(), question.isObjective(),
                     questionService.sumTotalScore(examId, question.getSubjectCode(), question.isObjective()));
+            if (!question.isObjective()) {
+                studentService.updateSubjectiveStatusAndScoreAndInspectorId(examId, question.getSubjectCode(),
+                        SubjectiveStatus.UNMARK, 0, null, null, null);
+            }
         }
         if (error.size() > 0) {
             addMessage(redirectAttributes, StringUtils.join(error, "<br\\>"));