Merge remote-tracking branch 'origin/wn_j' into ywx

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EScanbatch.java

@@ -0,0 +1,48 @@
+package com.xhkjedu.sexam.model.paperstudent;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description: 扫描答题卡批次表
+ * @Author: wn
+ * @CreateTime: 2022-08-11  09:06
+ */
+@Data
+@Table(name = "e_scanbatch")
+public class EScanbatch extends BaseBean {
+    @Id
+    private Integer batchid;
+
+    //扫描批次名称
+    private String batchname;
+
+    //考试id
+    private Integer examid;
+
+    //试卷id
+    private Integer epid;
+
+    //批次应扫张数
+    private Integer batchnum;
+
+    //扫描数量
+    private Integer scannum;
+
+    //扫描出错数量
+    private Integer errornum;
+
+    //缺考数量
+    private Integer qknum;
+
+    //违规数量
+    private Integer wgnum;
+
+    //创建时间
+    private Integer createtime;
+
+
+}

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EScanerror.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.sexam.model.paperstudent;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @Description: TODO 扫描出错信息
+ * @Author: wn
+ * @CreateTime: 2022-08-11  09:24
+ */
+@Data
+@Table(name = "e_scanerror")
+public class EScanerror extends BaseBean {
+    @Id
+    private Integer serrorid;
+
+    //扫描批次id
+    private Integer batchid;
+
+    //错误类型
+    private Integer errortype;
+
+    //错误内容
+    private String errorjson;
+
+}

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -323,7 +323,7 @@ public class EPaperStudentService {
     @Transactional(rollbackFor = Exception.class)
     public void saveCommitPaper(Integer epsid){
         EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(epsid);
-        if(ps == null || ps.getSstate() == 1){
+        if(ps == null || ps.getSstate() == 2){
             return;
         }
         EPaperStudent paperStudent = new EPaperStudent();
@@ -368,7 +368,7 @@ public class EPaperStudentService {
         List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
         EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(pswvo.getEpsid());
         //试卷不存在或者已提交
-        if(ps == null || ps.getSstate() == 1){
+        if(ps == null || ps.getSstate() == 2){
             return;
         }
         //获取试卷中所有试题答案及分值