3.1.1 fix

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -208,9 +208,9 @@ public class DataUploadService {
                 slicein = new FileInputStream(thumbFileName);
             }
 
-            List<Paper> allPapers = paperRepo.findByWorkIdAndSubjectAndTest(student.getWorkId(), subject, TrialEnum.DEFAULT.getId());
-
-            Paper exist = allPapers.stream().filter(m -> student.getExamNumber().equals(m.getExamNumber())).collect(Collectors.toList()).get(0);
+            /*List<Paper> allPapers = paperRepo.findByWorkIdAndSubjectAndTest(student.getWorkId(), subject, TrialEnum.DEFAULT.getId());
+            Paper exist = allPapers.stream().filter(m -> student.getExamNumber().equals(m.getExamNumber())).collect(Collectors.toList()).get(0);*/
+            Paper exist = paperRepo.findByWorkIdAndSubjectAndExamNumber(student.getWorkId(), subject, student.getExamNumber());
             String sheetMD5 = DigestUtils.md5Hex(sheetIn);
             String sliceMD5 = DigestUtils.md5Hex(slicein);
             sheetIn.close();
@@ -528,9 +528,10 @@ public class DataUploadService {
     public Paper savePaper(Student student, Subject subject, boolean isManual, String level, Long scanUserId) throws Exception {
         ExamQuestion examQuestion = examQuestionRepo.findByWorkIdAndSubjectAndAreaCode(student.getWorkId(), subject, student.getAreaCode());
 
-        List<Paper> allPapers = paperRepo.findByWorkIdAndSubjectAndTest(student.getWorkId(), subject, TrialEnum.DEFAULT.getId());
+        /*List<Paper> allPapers = paperRepo.findByWorkIdAndSubjectAndTest(student.getWorkId(), subject, TrialEnum.DEFAULT.getId());
         List<Paper> filterList = allPapers.stream().filter(m -> student.getExamNumber().equals(m.getExamNumber())).collect(Collectors.toList());
-        Paper paper = filterList.isEmpty() ? null : filterList.get(0);
+        Paper paper = filterList.isEmpty() ? null : filterList.get(0);*/
+        Paper paper = paperRepo.findByWorkIdAndSubjectAndExamNumber(student.getWorkId(), subject, student.getExamNumber());
         int firstCollectSize = getFileSize(subject, student);
         if (paper == null) {
             Long random = randomUtil.randomPaper(student.getWorkId());

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/PaperApi.java

@@ -898,7 +898,7 @@ public class PaperApi {
     @PostMapping("/mark_paper")
     @Transactional
     public Object markPaper(@RequestParam Long paperId, @RequestParam boolean isMark, @RequestParam Role role) {
-        if (Role.ADMIN.equals(role)) {
+        if (Role.ADMIN.equals(role) || Role.QC.equals(role)) {
             paperRepo.updatePaperAdminMarkById(paperId, isMark);
         } else if (Role.MARK_LEADER.equals(role)) {
             paperRepo.updatePaperMarkById(paperId, isMark);

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/MarkTaskLevelAssembler.java

@@ -212,20 +212,15 @@ public class MarkTaskLevelAssembler {
         MarkTaskDTO markTaskDTO = null;
         if (markTask != null) {
             markTaskDTO = new MarkTaskDTO();
-//            markTaskDTO.setId(markTask.getId());
-//            markTaskDTO.setRejected(markTask.isRejected());
             markTaskDTO.setMarkerId(markTask.getMarkerId());
             MarkUser markUser = markUserRepo.findOne(markTask.getMarkerId());
             markTaskDTO.setLoginName(markUser.getLoginName());
             markTaskDTO.setMarker(markTask.getMarkerName());
             markTaskDTO.setUpdatedOn(markTask.getUpdatedOn());
-//            markTaskDTO.setResult(markTask.getResult());
             Paper paper = markTask.getPaper();
-//            markTaskDTO.setLevel(markTask.getResult());
             markTaskDTO.setRoughLevel(markTask.getPaper().getRoughLevel());
             markTaskDTO.setOriginLevel(markTask.getOriginLevel() == null ? "" : markTask.getOriginLevel());
             markTaskDTO.setSn(markTask.getSecretNumber());
-//            markTaskDTO.setRedoLevel(paper.getRedoLevel());
             String imgSrc = null;
             String thumbSrc = null;
             String fileName = paper.getExamNumber();
@@ -252,15 +247,7 @@ public class MarkTaskLevelAssembler {
             if (Objects.nonNull(markTask.getDisplayNumber())) {
                 markTaskDTO.setDisplayNumber(markTask.getDisplayNumber() == 1);
             }
-//            markTaskDTO.setShift(paper.isShift());
-//            markTaskDTO.setShiftScore(paper.isShiftScore());
-
-//            markTaskDTO.setIsRejectedByLeader(paper.isRejectedByLeader() != null && paper.isRejectedByLeader());
-            //打回总次数
-//            int rejectedCount = markLogRepo.countByWorkIdAndPaperIdAndOperType(paper.getWorkId(), paper.getId(), Objects.nonNull(paper.isRejectedByLeader()) && paper.isRejectedByLeader() ? MarkLogOperType.CALLBACK_LEVEl.getId() : MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId());
-//            markTaskDTO.setRejectedCount(rejectedCount);
-//            markTaskDTO.setDeviationDirection(markTask.getDeviationDirection());
-//            markTaskDTO.setMark(markTask.isMark());
+            markTaskDTO.setSelfCheck(true);
         }
         return markTaskDTO;
     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/MarkTaskRoughLevelAssembler.java

@@ -213,19 +213,13 @@ public class MarkTaskRoughLevelAssembler {
         MarkTaskDTO markTaskDTO = null;
         if (markTask != null) {
             markTaskDTO = new MarkTaskDTO();
-            markTaskDTO.setId(markTask.getId());
-//            markTaskDTO.setRejected(markTask.isRejected());
             markTaskDTO.setMarkerId(markTask.getMarkerId());
             MarkUser markUser = markUserRepo.findOne(markTask.getMarkerId());
             markTaskDTO.setLoginName(markUser.getLoginName());
             markTaskDTO.setMarker(markTask.getMarkerName());
             markTaskDTO.setUpdatedOn(markTask.getUpdatedOn());
-//            markTaskDTO.setResult(markTask.getResult());
             Paper paper = markTask.getPaper();
-//            markTaskDTO.setLevel(markTask.getResult());
-//            markTaskDTO.setOriginLevel(markTask.getOriginLevel() == null ? "" : markTask.getOriginLevel());
             markTaskDTO.setSn(markTask.getSecretNumber());
-//            markTaskDTO.setRedoLevel(paper.getRedoLevel());
             String imgSrc = null;
             String thumbSrc = null;
             String fileName = paper.getExamNumber();
@@ -243,9 +237,6 @@ public class MarkTaskRoughLevelAssembler {
             }
             markTaskDTO.setThumbSrc(thumbSrc);
             markTaskDTO.setImgSrc(imgSrc);
-//            markTaskDTO.setRoughSample(paper.isRoughSample());
-//            markTaskDTO.setSample(paper.isSample());
-//            markTaskDTO.setMarkByLeader(paper.isMarkByLeader());
             markTaskDTO.setRandomSeqNew(markTask.getRandomSeqNew());
             markTaskDTO.setRandomSeq(markTask.getRandomSeq());
             markTaskDTO.setPaperId(paper.getId());
@@ -253,15 +244,7 @@ public class MarkTaskRoughLevelAssembler {
             if (Objects.nonNull(markTask.getDisplayNumber())) {
                 markTaskDTO.setDisplayNumber(markTask.getDisplayNumber() == 1);
             }
-//            markTaskDTO.setShift(paper.isShift());
-//            markTaskDTO.setShiftScore(paper.isShiftScore());
-
-//            markTaskDTO.setIsRejectedByLeader(paper.isRejectedByLeader() != null && paper.isRejectedByLeader());
-            //打回总次数
-//            int rejectedCount = markLogRepo.countByWorkIdAndPaperIdAndOperType(paper.getWorkId(), paper.getId(), Objects.nonNull(paper.isRejectedByLeader()) && paper.isRejectedByLeader() ? MarkLogOperType.CALLBACK_LEVEl.getId() : MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId());
-//            markTaskDTO.setRejectedCount(rejectedCount);
-//            markTaskDTO.setDeviationDirection(markTask.getDeviationDirection());
-//            markTaskDTO.setMark(markTask.isMark());
+            markTaskDTO.setSelfCheck(true);
         }
         return markTaskDTO;
     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/dto/MarkTaskDTO.java

@@ -49,6 +49,7 @@ public class MarkTaskDTO implements Serializable{
     private String dateMineResult;
     private String deviationDirection;
     private Boolean isMark;
+    private Boolean isSelfCheck;
 
     public Long getWorkId() {
         return workId;
@@ -318,4 +319,11 @@ public class MarkTaskDTO implements Serializable{
         isMark = mark;
     }
 
+    public Boolean getSelfCheck() {
+        return isSelfCheck;
+    }
+
+    public void setSelfCheck(Boolean selfCheck) {
+        isSelfCheck = selfCheck;
+    }
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkTaskSelfCheckService.java

@@ -3,6 +3,8 @@ package cn.com.qmth.stmms.ms.marking.service;
 import cn.com.qmth.stmms.ms.core.cache.ParamCache;
 import cn.com.qmth.stmms.ms.core.domain.Level;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
+import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
+import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTaskLevel;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTaskMarkerPaper;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTaskRoughLevel;
@@ -50,6 +52,9 @@ public class MarkTaskSelfCheckService {
     @Resource
     private MarkerGroupLeaderRepo markerGroupLeaderRepo;
 
+    @Resource
+    private MarkSubjectRepo markSubjectRepo;
+
     @Resource
     private LevelRepo levelRepo;
 
@@ -63,6 +68,11 @@ public class MarkTaskSelfCheckService {
      */
     @Transactional
     public boolean updateMarkingCount(Long workId, Subject subject, MarkStage stage, Long markerId, Long taskId) {
+        MarkSubject markSubject = markSubjectRepo.findOne(workId + "-" + subject.name());
+        if (markSubject.getTest() != TrialEnum.DEFAULT.getId()) {
+            return false;
+        }
+
         int selfCheckFrequency = 0;
         if (MarkStage.ROUGH_LEVEL.equals(stage)) {
             selfCheckFrequency = ParamCache.roughLevelConfigMap.get(String.valueOf(workId)).getSelfCheckFrequency();