3.3.0 fix

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/refix/AnswerRefixDomain.java

@@ -9,14 +9,8 @@ import java.util.List;
 
 public class AnswerRefixDomain {
 
-    @NotNull(message = "考试Id不能为空")
-    private Long examId;
-    
-    @NotBlank(message = "科目不能为空")
-    private String coursePaperId;
-
-    @NotBlank(message = "学号不能为空")
-    private String studentCode;
+    @NotNull(message = "考生Id不能为空")
+    private Long studentId;
 
     @NotNull(message = "卡格式编号不能为空")
     @Min(value = 1, message = "卡格式编号不能小于1")
@@ -27,32 +21,15 @@ public class AnswerRefixDomain {
     @Size(min = 1, message = "paper不能为空")
     private List<PaperRefixDomain> papers;
 
-    public Long getExamId() {
-        return examId;
+    public Long getStudentId() {
+        return studentId;
     }
 
-    public void setExamId(Long examId) {
-        this.examId = examId;
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
     }
 
-
-    public String getCoursePaperId() {
-		return coursePaperId;
-	}
-
-	public void setCoursePaperId(String coursePaperId) {
-		this.coursePaperId = coursePaperId;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public Integer getCardNumber() {
+    public Integer getCardNumber() {
         return cardNumber;
     }
 
@@ -70,7 +47,7 @@ public class AnswerRefixDomain {
 
     public PaperRefixDomain findPaperDomain(Integer paperIndex, Long paperId) {
         for (PaperRefixDomain domain : papers) {
-            if (domain.getId().equals(paperId) && domain.getIndex().equals(paperIndex)) {
+            if (domain.getId().equals(paperId) && domain.getNumber().equals(paperIndex)) {
                 return domain;
             }
         }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/refix/PageRefixDomain.java

@@ -8,13 +8,15 @@ import com.qmth.teachcloud.mark.bean.BoolResult;
 import com.qmth.teachcloud.mark.bean.StringResult;
 import com.qmth.teachcloud.mark.entity.ScanPaperPage;
 
+import java.util.List;
+
 public class PageRefixDomain {
 
 	@NotNull(message = "paper.page.index不能为空")
 	@Min(value = 1, message = "paper.page.index不能小于1")
 	private Integer index;
 
-	private String sheetUri;
+	private List<String> sheetUri;
 
 	private BoolResult absent;
 
@@ -36,11 +38,11 @@ public class PageRefixDomain {
 		this.index = index;
 	}
 
-	public String getSheetUri() {
+	public List<String> getSheetUri() {
 		return sheetUri;
 	}
 
-	public void setSheetUri(String sheetUri) {
+	public void setSheetUri(List<String> sheetUri) {
 		this.sheetUri = sheetUri;
 	}
 
@@ -93,7 +95,7 @@ public class PageRefixDomain {
 	}
 
 	public ScanPaperPage update(ScanPaperPage page) {
-		page.setSheetPath(sheetUri);
+//		page.setSheetPath(sheetUri);
 		page.setAbsent(absent);
 		page.setBreach(breach);
 //		page.setPaperType(paperType);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/refix/PaperRefixDomain.java

@@ -11,9 +11,9 @@ public class PaperRefixDomain {
     @NotNull(message = "paper.id不能为空")
     private Long id;
 
-    @NotNull(message = "paper.index不能为空")
-    @Min(value = 1, message = "paper.index不能小于1")
-    private Integer index;
+    @NotNull(message = "paper.number不能为空")
+    @Min(value = 1, message = "paper.number不能小于1")
+    private Integer number;
 
     @NotNull(message = "paper.mismatch不能为空")
     private Boolean mismatch;
@@ -31,16 +31,15 @@ public class PaperRefixDomain {
         this.id = id;
     }
 
+    public Integer getNumber() {
+        return number;
+    }
 
-    public Integer getIndex() {
-		return index;
-	}
-
-	public void setIndex(Integer index) {
-		this.index = index;
-	}
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
 
-	public Boolean getMismatch() {
+    public Boolean getMismatch() {
         return mismatch;
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanRefixBatchServiceImpl.java

@@ -59,12 +59,11 @@ public class ScanRefixBatchServiceImpl extends ServiceImpl<ScanRefixBatchMapper,
 	@Transactional
 	@Override
 	public AnswerRefixVo answerRefix(Long userId, AnswerRefixDomain domain) {
-		MarkStudent student = studentService.findByExamIdAndCoursePaperIdAndStudentCode(domain.getExamId(),
-				domain.getCoursePaperId(), domain.getStudentCode());
+		MarkStudent student = studentService.getById(domain.getStudentId());
 		if (student == null) {
 			throw new ParameterException("考生信息未找到");
 		}
-		ScanAnswerCard answerCard = answerCardService.findByExamAndNumber(domain.getExamId(), domain.getCardNumber());
+		ScanAnswerCard answerCard = answerCardService.findByExamAndNumber(student.getExamId(), domain.getCardNumber());
 		if (answerCard == null) {
 			throw new ParameterException("卡格式信息未找到");
 		}