线下版本-采集日志记录bug-20201019

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/controller/MarkLogController.java

@@ -194,11 +194,11 @@ public class MarkLogController {
         Integer subjectId = Integer.valueOf(request.getParameter("subjectId"));
         //准考证号
         String examNumber = request.getParameter("examNumber");
+        Subject subject = Subject.values()[subjectId - 1];
         //试卷信息
-        List<Paper> paperList = paperRepo.findByWorkIdAndExamNumber(workId, examNumber);
+        Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumber(workId, subject, examNumber);
 
         Integer operType = MarkLogOperType.COLLECT.getId();
-        Subject subject = Subject.values()[subjectId - 1];
 
         Work work = workRepo.findOne(workId);
 
@@ -212,15 +212,14 @@ public class MarkLogController {
         markLog.setOperType(operType);
         markLog.setWorkId(workId);
         markLog.setWorkName(work.getName());
-        if (paperList != null && paperList.size() > 0) {
-            Paper paper = paperList.get(0);
+        if (paper != null) {
             markLog.setPaperId(paper.getId());
         }
         markLog.setStage(MarkStage.INIT);
         //识别方式
         String manual = request.getParameter("manual");
         //增加考生不存在备注
-        markLog.setRemark(paperList == null || paperList.size() == 0 ? "考生不存在" : "0".equals(manual) ? "正常扫描" : "1".equals(manual) ? "手工绑定" : null);
+        markLog.setRemark(paper == null ? "考生不存在" : "0".equals(manual) ? "正常扫描" : "1".equals(manual) ? "手工绑定" : null);
         //操作时间
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String time = request.getParameter("time");