美术阅卷11月新增需求-修复BUG

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

@@ -193,7 +193,6 @@ public class PaperApi {
             //空白卷不展示
             predicates.add(builder.equal(root.get("isMissing"), false));
             return builder.and(predicates.toArray(new Predicate[predicates.size()]));
-
         };
 
         Page<Paper> papers = paperRepo.findAll(specification, pageable);

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

@@ -50,7 +50,7 @@ public class PaperAssembler {
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), paper.getExamNumber());
         }
         //查询阶段
-        MarkSubject markSubject = markSubjectRepo.findOne(paper.getWorkId()+"-"+paper.getSubject());
+        MarkSubject markSubject = markSubjectRepo.findOne(paper.getWorkId() + "-" + paper.getSubject());
         PaperDTO paperDTO = null;
         if (paper != null) {
             paperDTO = new PaperDTO();
@@ -82,7 +82,7 @@ public class PaperAssembler {
             }
             paperDTO.setStage(markSubject.getStage());
             paperDTO.setTest(markSubject.getTest());
-
+            paperDTO.setPaperTest(paper.getTest());
         }
         return paperDTO;
     }
@@ -101,6 +101,8 @@ public class PaperAssembler {
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), paper.getExamNumber());
             sheetSrc = systemConfig.getSheetUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), paper.getExamNumber());
         }
+        //查询阶段
+        MarkSubject markSubject = markSubjectRepo.findOne(paper.getWorkId() + "-" + paper.getSubject());
         PaperDTO paperDTO = null;
         if (paper != null) {
             paperDTO = new PaperDTO();
@@ -131,7 +133,10 @@ public class PaperAssembler {
             if (paper.getInspectLevel() != null) {
                 paperDTO.setInspectLevel(paper.getInspectLevel());
             }
-
+            paperDTO.setMissing(paper.getIsMissing());
+            paperDTO.setStage(markSubject.getStage());
+            paperDTO.setTest(paper.getTest());
+            paperDTO.setPaperTest(paper.getTest());
         }
         return paperDTO;
     }

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

@@ -39,9 +39,17 @@ public class PaperDTO implements Serializable{
     private boolean isMissing;
     private MarkStage stage;
     private int test;
-
+    private int paperTest;
     private List<MarkTaskDTO> markResults = new ArrayList<>();
 
+    public int getPaperTest() {
+        return paperTest;
+    }
+
+    public void setPaperTest(int paperTest) {
+        this.paperTest = paperTest;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

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

@@ -200,6 +200,7 @@ public class MarkingService {
         paperRepo.save(paper);
         List<MarkTask> markTasks = markTaskRepo.findByPaperIdAndStage(paper.getId(), MarkStage.LEVEL);
         for (MarkTask markTask : markTasks) {
+//            markTask.setOriginLevel(markTask.getResult());
             markTask.setResult(level);
         }
         markTaskRepo.save(markTasks);