fix bugs

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

@@ -205,7 +205,7 @@ public interface ExamStudentDao extends PagingAndSortingRepository<ExamStudent,
     @Query("select sum(s.sheetCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2 ")
     public long sumSheetCountByExamIdAndSubjectCode(int examId, String subjectCode);
 
-    @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.subjectiveStatus in (?2) ")
+    @Query("select distinct m.subjectCode from ExamStudent m where m.examId=?1 and m.subjectiveStatus in (?2)  and m.upload=true and m.absent=false and m.breach=false ")
     Set<String> findSubjectUnInspectedByExamId(int examId, SubjectiveStatus... status);
 
     @Query("select s.college from ExamStudent s where s.examId=?1 group by s.college")

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

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.biz.exam.dao;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import cn.com.qmth.stmms.biz.exam.model.SelectiveStudent;
@@ -13,4 +14,8 @@ public interface SelectiveStudentDao extends JpaRepository<SelectiveStudent, Int
     @Modifying(clearAutomatically = true)
     void deleteByExamIdAndSubjectCode(Integer examId, String subjectCode);
 
+    @Modifying(clearAutomatically = true)
+    @Query("delete SelectiveStudent s where s.studentId=?1")
+    void deleteByStudentId(Integer studentId);
+
 }

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

@@ -531,7 +531,7 @@ public class MarkServiceImpl implements MarkService {
         // 主观状态与得分明细
         groupStudentDao.deleteByStudentId(student.getId());
         scoreDao.deleteByStudentId(student.getId());
-        selectiveStudentDao.delete(student.getId());
+        selectiveStudentDao.deleteByStudentId(student.getId());
         updateAllCount(student.getExamId(), student.getSubjectCode());
         // 复核记录
         inspectHistoryDao.deleteByStudentId(student.getId());

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/FileController.java

@@ -51,6 +51,7 @@ import cn.com.qmth.stmms.common.enums.ObjectiveStatus;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
+import com.aliyun.oss.common.utils.BinaryUtil;
 import com.google.common.io.ByteStreams;
 
 /**
@@ -338,6 +339,7 @@ public class FileController extends BaseApiController {
                 validatePageCount(cardFile.getPages().size());
                 byte[] out = cardFile.output();
                 ins = new ByteArrayInputStream(out);
+                md5 = BinaryUtil.encodeMD5(out);
                 card = answerCardService.findByExamIdAndSubjectCode(examId, subjectCode);
                 if (card == null) {
                     card = new AnswerCard();

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

@@ -173,7 +173,7 @@
         <th>层次</th>
         <th>专业类型</th>
         <th>扫描识别</th>
-        <th>扫描张数</th>
+        <th>图片张数</th>
         <th>人工指定</th>
         <th>批次编号</th>
         <th>签到表编号</th>