正考转缺考时，考生状态恢复为未评

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -64,8 +64,9 @@ public interface ExamStudentDao
     public List<String> findDistinctPackageCode(int examId);
 
     @Modifying
-    @Query("update ExamStudent s set s.subjectiveStatus=?2, s.subjectiveScore=?3, s.subjectiveScoreList=?4 where s.id=?1")
-    public void updateSubjectiveStatusAndScore(Integer id, SubjectiveStatus status, double score, String scoreList);
+    @Query("update ExamStudent s set s.subjectiveStatus=?2, s.subjectiveScore=?3, s.subjectiveScoreList=?4 ,s.inspectorId=?5 where s.id=?1")
+    public void updateSubjectiveStatusAndScore(Integer id, SubjectiveStatus status, double score, String scoreList,
+            Integer inspectorId);
 
     @Modifying
     @Query("update ExamStudent s set s.subjectiveStatus=?3, s.subjectiveScore=?4, s.subjectiveScoreList=?5,s.inspectTime=?6,s.inspectorId=?7 where s.examId=?1 and s.subjectCode=?2")

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -447,7 +447,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     @Override
     @Transactional
     public void updateSubjectiveStatusAndScore(Integer id, SubjectiveStatus status, double score, String scoreList) {
-        studentDao.updateSubjectiveStatusAndScore(id, status, score, scoreList);
+        studentDao.updateSubjectiveStatusAndScore(id, status, score, scoreList, null);
     }
 
     @Override

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

@@ -429,6 +429,7 @@ public class StudentController extends BaseExamController {
                     student.setSubjectiveScore(0d);
                     student.setSubjectiveScoreList(null);
                     studentService.save(student);
+                    studentService.updateSubjectiveStatusAndScore(student.getId(), SubjectiveStatus.UNMARK, 0, null);
                     successNum++;
                 } else {
                     failureMsg.append("<br/>准考证号 " + studentVO.getExamNumber() + " 不存在; ");

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/BaseController.java

@@ -278,12 +278,16 @@ public class BaseController {
             student.setObjectiveScoreList(null);
             student.setSubjectiveScore(0d);
             student.setSubjectiveScoreList(null);
+            studentService.updateSubjectiveStatusAndScore(student.getId(), SubjectiveStatus.UNMARK, 0, null);
             studentService.save(student);
         }
         boolean success = studentService.updateScanInfo(student);
         if (success) {
-            subjectService.updateUploadCount(student.getExamId(), student.getSubjectCode(), (int) studentService
-                    .countUploadedByExamIdAndSubjectCode(student.getExamId(), student.getSubjectCode()));
+            subjectService.updateUploadCount(
+                    student.getExamId(),
+                    student.getSubjectCode(),
+                    (int) studentService.countUploadedByExamIdAndSubjectCode(student.getExamId(),
+                            student.getSubjectCode()));
         }
         return success;
     }