机构版-3.0.0-bug修复

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

@@ -83,7 +83,7 @@ public class ChangeLevelApi {
                 List<Paper> papers;
                 if("1".equals(type)) {
                     papers = paperRepo.findByworkIdAndSubjectAndQuestionIdAndIsMissingAndTest(workId, Subject.valueOf(subject), questionId, false, TrialEnum.DEFAULT.ordinal());
-                    if(papers != null && papers.size() > 0) {
+                    if(papers != null && !papers.isEmpty()) {
                         CriteriaBuilder.In<Object> in = builder.in(root.get("paperId"));
                         for (Paper paper : papers) {
                             in.value(paper.getId());
@@ -92,7 +92,7 @@ public class ChangeLevelApi {
                     }
                 } else {
                     papers = paperRepo.findByworkIdAndSubjectAndQuestionIdAndIsMissingAndTestAndLevelIsNull(workId, Subject.valueOf(subject), questionId, false, TrialEnum.DEFAULT.ordinal());
-                    if(papers != null && papers.size() > 0) {
+                    if(papers != null && !papers.isEmpty()) {
                         CriteriaBuilder.In<Object> in = builder.in(root.get("paperId"));
                         for (Paper paper : papers) {
                             in.value(paper.getId());

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

@@ -104,6 +104,7 @@ public class MarkTaskAssembler {
             markTaskDTO.setRejectedCount(rejectedCount);
             markTaskDTO.setDeviationDirection(markTask.getDeviationDirection());
             markTaskDTO.setMark(markTask.isMark());
+            markTaskDTO.setManualScore(markTask.getManualScore());
         }
         return markTaskDTO;
     }

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

@@ -42,6 +42,7 @@ public class MarkTaskDTO implements Serializable{
     private String dateMineResult;
     private String deviationDirection;
     private Boolean isMark;
+    private Integer manualScore;
 
     public Integer getRandomSeq() {
         return randomSeq;
@@ -278,4 +279,12 @@ public class MarkTaskDTO implements Serializable{
     public void setMark(Boolean mark) {
         isMark = mark;
     }
+
+    public Integer getManualScore() {
+        return manualScore;
+    }
+
+    public void setManualScore(Integer manualScore) {
+        this.manualScore = manualScore;
+    }
 }