Browse Source

添加字段

tags/正式版本
王宁 2 years ago
parent
commit
b365bf6d0b

+ 1
- 1
sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EScanbatchController.java View File

28
     //保持批次信息
28
     //保持批次信息
29
     @PostMapping("/save")
29
     @PostMapping("/save")
30
     public ResultVo saveEscanbatch(@RequestBody EScanbatch eScanbatch) {
30
     public ResultVo saveEscanbatch(@RequestBody EScanbatch eScanbatch) {
31
-        N_Utils.validation(new Object[]{eScanbatch.getEpid(),"试卷id",1,eScanbatch.getBatchname(),"设备",2});
31
+        N_Utils.validation(new Object[]{eScanbatch.getEpid(),"试卷id",1,eScanbatch.getMac(),"设备",2});
32
         Map map = eScanbatchService.saveScanBatch(eScanbatch);
32
         Map map = eScanbatchService.saveScanBatch(eScanbatch);
33
         return new ResultVo(0, "成功保存", map);
33
         return new ResultVo(0, "成功保存", map);
34
     }
34
     }

+ 3
- 0
sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EScanbatch.java View File

44
     //创建时间
44
     //创建时间
45
     private Integer createtime;
45
     private Integer createtime;
46
 
46
 
47
+    //扫描仪mac地址
48
+    private String mac;
49
+
47
 
50
 
48
 }
51
 }

+ 7
- 0
sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EScanerror.java View File

5
 
5
 
6
 import javax.persistence.Id;
6
 import javax.persistence.Id;
7
 import javax.persistence.Table;
7
 import javax.persistence.Table;
8
+import java.util.List;
8
 
9
 
9
 /**
10
 /**
10
  * @Description: TODO 扫描出错信息
11
  * @Description: TODO 扫描出错信息
23
     //错误类型
24
     //错误类型
24
     private Integer errortype;
25
     private Integer errortype;
25
 
26
 
27
+    //当前批次第几页
28
+    private Integer pagenum;
29
+
30
+    //学生答题未处理图片
31
+    private String stupic;
32
+
26
     //错误内容
33
     //错误内容
27
     private String errorjson;
34
     private String errorjson;
28
 
35
 

+ 2
- 1
sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java View File

516
         EScanerror er = new EScanerror();
516
         EScanerror er = new EScanerror();
517
         er.setBatchid(pswvo.getBatchid());
517
         er.setBatchid(pswvo.getBatchid());
518
         er.setErrortype(errortype);
518
         er.setErrortype(errortype);
519
+        er.setPagenum(pswvo.getPagenum());
519
         er.setErrorjson(JSON.toJSONString(pswvo));
520
         er.setErrorjson(JSON.toJSONString(pswvo));
520
         er.setCreatetime(N_Utils.getSecondTimestamp());
521
         er.setCreatetime(N_Utils.getSecondTimestamp());
521
         eScanerrorMapper.insertSelective(er);
522
         eScanerrorMapper.insertSelective(er);
532
     public void saveScanPaperError(EScanerror eScanerror){
533
     public void saveScanPaperError(EScanerror eScanerror){
533
         eScanerror.setErrortype(1);
534
         eScanerror.setErrortype(1);
534
         eScanerror.setCreatetime(N_Utils.getSecondTimestamp());
535
         eScanerror.setCreatetime(N_Utils.getSecondTimestamp());
535
-        eScanerrorMapper.insertSelective(eScanerror);
536
+        eScanerrorMapper.insertUseGeneratedKeys(eScanerror);
536
         eScanbatchMapper.updateErrornum(eScanerror.getBatchid());
537
         eScanbatchMapper.updateErrornum(eScanerror.getBatchid());
537
     }
538
     }
538
 
539
 

+ 1
- 1
sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java View File

31
      * @date: 2022/8/11/011 9:42
31
      * @date: 2022/8/11/011 9:42
32
      **/
32
      **/
33
     public Map saveScanBatch(EScanbatch eScanbatch){
33
     public Map saveScanBatch(EScanbatch eScanbatch){
34
-        String batchname = eScanbatch.getBatchname() + "-" + eScanbatch.getEpid() + "-";
34
+        String batchname = eScanbatch.getMac() + "-" + eScanbatch.getEpid() + "-";
35
         //获取数据库中该批次名的扫描批次数量
35
         //获取数据库中该批次名的扫描批次数量
36
         Integer bnum = eScanbatchMapper.getBatchNameLikeNum(batchname);
36
         Integer bnum = eScanbatchMapper.getBatchNameLikeNum(batchname);
37
         if(bnum == null || bnum == 0){
37
         if(bnum == null || bnum == 0){

+ 2
- 0
sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PaperStudentWebVo.java View File

34
 
34
 
35
     private Integer batchid;//答题卡扫描批次
35
     private Integer batchid;//答题卡扫描批次
36
 
36
 
37
+    private Integer pagenum;//当前批次第几页
38
+
37
 }
39
 }

Loading…
Cancel
Save