3.3.0 update

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/mark/MarkProblemType.java

@@ -4,8 +4,8 @@ import java.util.LinkedList;
 import java.util.List;
 
 public enum MarkProblemType {
-    WRONG("未处理", 0),
-    BLUR("已评", 1),
+    WRONG("答错位置", 0),
+    BLUR("试卷模糊", 1),
     OTHER("其它", 2);
 
     private String name;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkProblemHistory.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.enums.mark.MarkProblemStatus;
+import com.qmth.teachcloud.common.enums.mark.MarkProblemType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -46,7 +48,7 @@ public class MarkProblemHistory implements Serializable {
     private String secretNumber;
 
     @ApiModelProperty(value = "问题类型")
-    private String type;
+    private MarkProblemType type;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "考生ID")
@@ -57,7 +59,7 @@ public class MarkProblemHistory implements Serializable {
     private Long taskId;
 
     @ApiModelProperty(value = "状态")
-    private String status;
+    private MarkProblemStatus status;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "处理人ID")
@@ -121,11 +123,11 @@ public class MarkProblemHistory implements Serializable {
     public void setSecretNumber(String secretNumber) {
         this.secretNumber = secretNumber;
     }
-    public String getType() {
+    public MarkProblemType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(MarkProblemType type) {
         this.type = type;
     }
     public Long getStudentId() {
@@ -142,11 +144,11 @@ public class MarkProblemHistory implements Serializable {
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
-    public String getStatus() {
+    public MarkProblemStatus getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(MarkProblemStatus status) {
         this.status = status;
     }
     public Long getUpdateUserId() {

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/PrintFinishService.java

@@ -13,5 +13,5 @@ public interface PrintFinishService {
 
     public void insertScanAnswerCard(ExamDetailCourseInitMarkDto dto);
 
-    public void insertMarkQuestion();
+    public void insertMarkQuestion(Long examId, String paperNumber, String content);
 }

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -101,6 +101,9 @@ public class PrintFinishServiceImpl implements PrintFinishService {
             for (PaperInfoVo paperInfoVo : paperInfoVoList) {
                 ExamCard examCard = examCardService.getById(paperInfoVo.getCardId());
                 if (examCard != null) {
+
+                    this.insertMarkQuestion(dto.getExamId(), dto.getPaperNumber(), examCard.getContent());
+
                     ScanAnswerCard scanAnswerCard = scanAnswerCardService.getByExamIdAndCoursePaperIdAndCardId(dto.getExamId(), dto.getCoursePaperId(), paperInfoVo.getCardId());
                     if (scanAnswerCard != null) {
                         continue;
@@ -138,7 +141,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
     }
 
     @Override
-    public void insertMarkQuestion() {
+    public void insertMarkQuestion(Long examId, String paperNumber, String content) {
 
     }
 }