线下版本-改档bug-20201113

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkTaskRepo.java

@@ -55,7 +55,7 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
     @Query(value = "select count(1) from mark_task m inner join paper p on m.paper_id = p.id where m.question_id = ?1 and m.marker_id = ?2 and m.stage = ?3 and p.level = ?4 and p.score_batch_no = ?5 and m.result is not null", nativeQuery = true)
     int countScoreByQuestionIdAndMarkerIdAndStageAndResult(Long questionId, Long markerId, int stage, String result, Long batchNo);
 
-    @Query(value = "select count(1) from mark_task m inner join paper p on m.paper_id = p.id where m.question_id = ?1 and m.marker_id = ?2 and m.stage = ?3 and p.level = ?4 and p.score_batch_no is not null and m.result is not null  and p.score is not null", nativeQuery = true)
+    @Query(value = "select count(1) from mark_task m inner join paper p on m.paper_id = p.id where m.question_id = ?1 and m.marker_id = ?2 and m.stage = ?3 and p.level = ?4 and p.score_batch_no is not null and m.result is not null", nativeQuery = true)
     int countScoreByQuestionIdAndMarkerIdAndStageAndResultAll(Long questionId, Long markerId, int stage, String result);
     /**
      * 查询评卷员的评卷任务

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

@@ -125,7 +125,7 @@ public class MarkTaskApi {
                 predicates.add(builder.equal(root.get("paper").get("level"), level));
                 predicates.add(builder.isNotNull(root.get("result")));
                 predicates.add(builder.equal(root.get("paper").get("isShift"), false));
-                predicates.add(builder.equal(root.get("paper").get("isShiftScore"), false));
+//                predicates.add(builder.equal(root.get("paper").get("isShiftScore"), false));
                 if(ParamCache.paramMap.get(workId).getScoreShowAllPaper() == 1){
                     predicates.add(builder.isNotNull(root.get("paper").get("scoreBatchNo")));
                 } else {

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

@@ -75,6 +75,8 @@ public class ChangeLevelAssembler {
             changeLevelDTO.setPaperId(changeLevel.getPaperId());
             changeLevelDTO.setAuditStatus(changeLevel.getAuditStatus());
             changeLevelDTO.setExamNumber(examNumber);
+            changeLevelDTO.setShift(paper.isShift());
+            changeLevelDTO.setShiftScore(paper.isShiftScore());
         }
         return changeLevelDTO;
     }

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

@@ -31,6 +31,8 @@ public class ChangeLevelDTO implements Serializable{
     private Integer randomSeq;
     private Integer auditStatus;
     private String examNumber;
+    private boolean shift;
+    private boolean shiftScore;
 
     public Integer getRandomSeq() {
         return randomSeq;
@@ -203,4 +205,20 @@ public class ChangeLevelDTO implements Serializable{
     public void setExamNumber(String examNumber) {
         this.examNumber = examNumber;
     }
+
+    public boolean isShift() {
+        return shift;
+    }
+
+    public void setShift(boolean shift) {
+        this.shift = shift;
+    }
+
+    public boolean isShiftScore() {
+        return shiftScore;
+    }
+
+    public void setShiftScore(boolean shiftScore) {
+        this.shiftScore = shiftScore;
+    }
 }