扫描保存单张试卷信息

sapi/src/main/java/com/xhkjedu/sapi/service/scantron/ScantronService.java

@@ -42,6 +42,11 @@ public class ScantronService {
     }
     //答题卡-修改
     public void update(TScantron tScantron){
+        if(N_Utils.isTrueInteger(tScantron.getSlayout()) && tScantron.getSlayout() > 1){
+            tScantron.setPapertype(1);
+        }else{
+            tScantron.setPapertype(2);
+        }
         scantronMapper.updateByPrimaryKeySelective(tScantron);
     }
 

smarking/src/main/java/com/xhkjedu/smarking/controller/scan/MsScanbatchController.java

@@ -31,7 +31,7 @@ public class MsScanbatchController {
     private MsScanbatchService msScanbatchService;
 
     /**
-     * @Description 新增扫描试卷
+     * @Description 新增试卷扫描批次
      * @Param [msScanbatch]
      * @Author auto
      * @Date 2024-10-15

smarking/src/main/java/com/xhkjedu/smarking/controller/scan/MsScanbatchPaperController.java

@@ -22,9 +22,7 @@ import java.util.Map;
 public class MsScanbatchPaperController {
     @Resource
     private MsScanbatchPaperService msScanbatchPaperService;
-
-
-
+    
 
     /*
      * @Description 扫描记录-查看原卷

smarking/src/main/java/com/xhkjedu/smarking/listener/MessageConsumer.java

@@ -1,174 +1,142 @@
-// package com.xhkjedu.smarking.listener;
-//
-// import com.alibaba.fastjson.JSON;
-// import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
-// import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
-// import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
-// import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
-// import com.xhkjedu.sexam.mapper.paperstudent.EScanerrorMapper;
-// import com.xhkjedu.sexam.mapper.report.EReportGenerateMapper;
-// import com.xhkjedu.sexam.model.paper.EPaper;
-// import com.xhkjedu.sexam.model.paper.EPaperFile;
-// import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
-// import com.xhkjedu.sexam.model.paperstudent.EScanerror;
-// import com.xhkjedu.sexam.utils.ConvertUtil;
-// import com.xhkjedu.sexam.vo.report.EReportVo;
-// import lombok.extern.slf4j.Slf4j;
-// import org.springframework.amqp.core.Message;
-// import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-// import org.springframework.amqp.rabbit.annotation.RabbitListener;
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.stereotype.Component;
-//
-// import javax.annotation.Resource;
-// import java.time.LocalDateTime;
-// import java.util.HashMap;
-// import java.util.Map;
-//
-// /**
-//  * 消息到达消费者监听类
-//  */
-// @Component
-// @Slf4j
-// public class MessageConsumer {
-//
-//     @Resource
-//     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
-//     @Resource
-//     private EPaperMapper ePaperMapper;
-//     @Resource
-//     private EScanerrorMapper eScanerrorMapper;
-//     @Resource
-//     private EPaperFileMapper ePaperFileMapper;
-//     @Resource
-//     private EReportGenerateMapper eReportGenerateMapper;
-//     @Resource
-//     private EBaseMapper eBaseMapper;
-//     @Autowired
-//     private ConvertUtil convertUtil;
-//
-//
-//     /*
-//      * 学生答案图片合并完处理转换状态
-//      *
-//      * @param [message]
-//      * @return void
-//      * @author ywx
-//      * @date 2022/5/9 13:44
-//      */
-//     @RabbitHandler
-//     @RabbitListener(queues = "${rabbitmq.examImgMergeHandleQueue}")
-//     public void imgMergeHandleQueue(Message message) {
-//         try {
-//             String msg = new String(message.getBody(), "UTF-8");
-//             System.out.println(LocalDateTime.now() + "学生试题答案合并接收消息内容：" + msg);
-//             EPaperStudentQuestion psq = JSON.parseObject(msg, EPaperStudentQuestion.class);
-//             if (psq.getConverted() != 1) {//合并失败不修改学生答案
-//                 psq.setStuanswer(null);
-//             } else {
-//                 psq.setStuanswer(JSON.toJSONString(new String[]{psq.getStuanswer()}));
-//             }
-//             ePaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
-//         } catch (Exception e) {
-//             log.error("学生试题答案合并失败：" + e.getMessage());
-//         }
-//     }
-//
-//     /**
-//      * @Description 修改试卷答题卡pdf
-//      * @Param [message]
-//      * @Return void
-//      * @Author wn
-//      * @Date 2022/8/2 14:00
-//      **/
-//     @RabbitHandler
-//     @RabbitListener(queues = "${rabbitmq.examBaseToPdfHandleQueue}")
-//     public void baseToPdfHandleQueue(Message message) {
-//         try {
-//             String msg = new String(message.getBody(), "UTF-8");
-//             System.out.println(LocalDateTime.now() + "答题卡图片合并接收消息内容：" + msg);
-//             EPaper paper = JSON.parseObject(msg, EPaper.class);
-//             ePaperMapper.updatePaperScantronpdf(paper);
-//         } catch (Exception e) {
-//             log.error("答题卡图片合并失败：" + e.getMessage());
-//         }
-//     }
-//
-//     /**
-//      * @Description 扫码出错答题卡base64转图片
-//      * @Param [message]
-//      * @Return void
-//      * @Author wn
-//      * @Date 2022/9/19 9:46
-//      **/
-//     @RabbitHandler
-//     @RabbitListener(queues = "${rabbitmq.examBaseToScanImgHandleQueue}")
-//     public void baseToScanImgHandleQueue(Message message) {
-//         try {
-//             String msg = new String(message.getBody(), "UTF-8");
-//             System.out.println(LocalDateTime.now() + "扫码出错答题卡base64转图片接收消息内容：" + msg);
-//             EScanerror eScanerror = JSON.parseObject(msg, EScanerror.class);
-//             if (eScanerror.getConverted() != null && eScanerror.getConverted() == 1) {
-//                 eScanerrorMapper.updateErrorStupic(eScanerror.getSerrorid(), eScanerror.getStupic());
-//             }
-//         } catch (Exception e) {
-//             log.error("扫码出错答题卡base64转图片失败：" + e.getMessage());
-//         }
-//     }
-//
-//     /**
-//      * @Description 考试附件试卷图片转pdf
-//      * @Param [message]
-//      * @Return void
-//      * @Author wn
-//      * @Date 2022/11/1 10:45
-//      **/
-//     @RabbitHandler
-//     @RabbitListener(queues = "${rabbitmq.examImgToPdfHandleQueue}")
-//     public void examImageToPdfHandleQueue(Message message) {
-//         try {
-//             String msg = new String(message.getBody(), "UTF-8");
-//             System.out.println(LocalDateTime.now() + "考试附件试卷图片转pdf接收消息内容：" + msg);
-//             EPaperFile paperFile = JSON.parseObject(msg, EPaperFile.class);
-//             if (paperFile.getConverted() != null && paperFile.getConverted() == 1) {
-//                 ePaperFileMapper.updateSourcepathByEpid(paperFile.getEpid(),paperFile.getSourcepath());
-//             }
-//         } catch (Exception e) {
-//             log.error("考试附件试卷图片转pdf失败：" + e.getMessage());
-//         }
-//     }
-//
-//     @RabbitHandler
-//     @RabbitListener(queues = "${rabbitmq.examHtmlToPdfHandleQueue}")
-//     public void examHtmlToPdfHandleQueue(Message message) {
-//         try {
-//             String msg = new String(message.getBody(), "UTF-8");
-//             System.out.println(LocalDateTime.now() + "考试报告html转pdf接收消息内容：" + msg);
-//             EReportVo report = JSON.parseObject(msg, EReportVo.class);
-//             if (report.getConverted() != null && report.getConverted() != 1) return;
-//             eReportGenerateMapper.updatePdf(report);//修改考试pdf地址
-//             Integer examid = report.getExamid();
-//             Integer type = report.getType();
-//             if (3 == type) {
-//                 Integer classid = report.getClassid();
-//                 Integer num = eReportGenerateMapper.getNoPdfNumByExamAndClassId(examid, classid);//考试班级未生成pdf的数量
-//                 if (0 == num) {
-//                     Map map = new HashMap();
-//                     String savefolder = eReportGenerateMapper.getSaveFolder(examid);
-//                     map.put("savefolder", savefolder + "/" +  + classid);
-//                     map.put("examid", examid);
-//                     map.put("classid", classid);
-//                     map.put("type", 4);
-//                     convertUtil.htmlToPdf(map);
-//                 }
-//             } else if (4 == type) {
-//                 Integer num = eReportGenerateMapper.getNoPdfNumByExamId(examid);//考试未生成pdf的数量
-//                 if (0 == num) {
-//                     eBaseMapper.updateExamReportState(examid, 2);
-//                 }
-//             }
-//         } catch (Exception e) {
-//             log.error("考试报告html转pdf失败：" + e.getMessage());
-//         }
-//     }
-// }
+package com.xhkjedu.smarking.listener;
+
+import com.xhkjedu.smarking.utils.ConvertUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 消息到达消费者监听类
+ */
+@Component
+@Slf4j
+public class MessageConsumer {
+
+
+    @Autowired
+    private ConvertUtil convertUtil;
+
+
+    /*
+     * @Description 学生题块、试题答案图片合并完处理转换状态
+     * @Date 2024/10/29 14:43:39
+     * @Author WN
+     * @Param [message]
+     * @Return void
+     **/
+    // @RabbitHandler
+    // @RabbitListener(queues = "${rabbitmq.markingImgMergeHandleQueue}")
+    // public void imgMergeHandleQueue(Message message) {
+    //     try {
+    //         String msg = new String(message.getBody(), "UTF-8");
+    //         System.out.println(LocalDateTime.now() + "学生题块、试题答案合并接收消息内容：" + msg);
+    //         EPaperStudentQuestion psq = JSON.parseObject(msg, EPaperStudentQuestion.class);
+    //         if (psq.getConverted() != 1) {//合并失败不修改学生答案
+    //             psq.setStuanswer(null);
+    //         } else {
+    //             psq.setStuanswer(JSON.toJSONString(new String[]{psq.getStuanswer()}));
+    //         }
+    //         ePaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
+    //     } catch (Exception e) {
+    //         log.error("学生试题答案合并失败：" + e.getMessage());
+    //     }
+    // }
+
+    /**
+     * @Description 修改试卷答题卡pdf
+     * @Param [message]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/2 14:00
+     **/
+    // @RabbitHandler
+    // @RabbitListener(queues = "${rabbitmq.markingBaseToPdfHandleQueue}")
+    // public void baseToPdfHandleQueue(Message message) {
+    //     try {
+    //         String msg = new String(message.getBody(), "UTF-8");
+    //         System.out.println(LocalDateTime.now() + "答题卡图片合并接收消息内容：" + msg);
+    //         EPaper paper = JSON.parseObject(msg, EPaper.class);
+    //         ePaperMapper.updatePaperScantronpdf(paper);
+    //     } catch (Exception e) {
+    //         log.error("答题卡图片合并失败：" + e.getMessage());
+    //     }
+    // }
+
+    /**
+     * @Description 扫码出错答题卡base64转图片
+     * @Param [message]
+     * @Return void
+     * @Author wn
+     * @Date 2022/9/19 9:46
+     **/
+    // @RabbitHandler
+    // @RabbitListener(queues = "${rabbitmq.markingBaseToScanImgHandleQueue}")
+    // public void baseToScanImgHandleQueue(Message message) {
+    //     try {
+    //         String msg = new String(message.getBody(), "UTF-8");
+    //         System.out.println(LocalDateTime.now() + "扫码出错答题卡base64转图片接收消息内容：" + msg);
+    //         EScanerror eScanerror = JSON.parseObject(msg, EScanerror.class);
+    //         if (eScanerror.getConverted() != null && eScanerror.getConverted() == 1) {
+    //             eScanerrorMapper.updateErrorStupic(eScanerror.getSerrorid(), eScanerror.getStupic());
+    //         }
+    //     } catch (Exception e) {
+    //         log.error("扫码出错答题卡base64转图片失败：" + e.getMessage());
+    //     }
+    // }
+
+    /**
+     * @Description 考试附件试卷图片转pdf
+     * @Param [message]
+     * @Return void
+     * @Author wn
+     * @Date 2022/11/1 10:45
+     **/
+    // @RabbitHandler
+    // @RabbitListener(queues = "${rabbitmq.markingImgToPdfHandleQueue}")
+    // public void examImageToPdfHandleQueue(Message message) {
+    //     try {
+    //         String msg = new String(message.getBody(), "UTF-8");
+    //         System.out.println(LocalDateTime.now() + "考试附件试卷图片转pdf接收消息内容：" + msg);
+    //         EPaperFile paperFile = JSON.parseObject(msg, EPaperFile.class);
+    //         if (paperFile.getConverted() != null && paperFile.getConverted() == 1) {
+    //             ePaperFileMapper.updateSourcepathByEpid(paperFile.getEpid(),paperFile.getSourcepath());
+    //         }
+    //     } catch (Exception e) {
+    //         log.error("考试附件试卷图片转pdf失败：" + e.getMessage());
+    //     }
+    // }
+
+    // @RabbitHandler
+    // @RabbitListener(queues = "${rabbitmq.markingHtmlToPdfHandleQueue}")
+    // public void examHtmlToPdfHandleQueue(Message message) {
+    //     try {
+    //         String msg = new String(message.getBody(), "UTF-8");
+    //         System.out.println(LocalDateTime.now() + "考试报告html转pdf接收消息内容：" + msg);
+    //         EReportVo report = JSON.parseObject(msg, EReportVo.class);
+    //         if (report.getConverted() != null && report.getConverted() != 1) return;
+    //         eReportGenerateMapper.updatePdf(report);//修改考试pdf地址
+    //         Integer examid = report.getExamid();
+    //         Integer type = report.getType();
+    //         if (3 == type) {
+    //             Integer classid = report.getClassid();
+    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamAndClassId(examid, classid);//考试班级未生成pdf的数量
+    //             if (0 == num) {
+    //                 Map map = new HashMap();
+    //                 String savefolder = eReportGenerateMapper.getSaveFolder(examid);
+    //                 map.put("savefolder", savefolder + "/" +  + classid);
+    //                 map.put("examid", examid);
+    //                 map.put("classid", classid);
+    //                 map.put("type", 4);
+    //                 convertUtil.htmlToPdf(map);
+    //             }
+    //         } else if (4 == type) {
+    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamId(examid);//考试未生成pdf的数量
+    //             if (0 == num) {
+    //                 eBaseMapper.updateExamReportState(examid, 2);
+    //             }
+    //         }
+    //     } catch (Exception e) {
+    //         log.error("考试报告html转pdf失败：" + e.getMessage());
+    //     }
+    // }
+}

smarking/src/main/java/com/xhkjedu/smarking/listener/MessageSender.java

@@ -52,11 +52,12 @@ public class MessageSender {
      * @Author wn
      * @Date 2022/7/28 16:46
      **/
-    public void imgMerge(Integer epsqid, List<String> userAnswers, Integer device) {
+    public void imgMerge(Integer mpsbid, List<String> userAnswers, Integer device) {
         Map map = new HashMap();
-        map.put("epsqid", epsqid);
+        map.put("mpsbid", mpsbid);
         map.put("stuanswers", userAnswers);
         map.put("device", device);
+        map.put("device", device);
         if (userAnswers.toString().contains(node2)) {
             rabbitTemplate.convertAndSend(markingImgMergeQueue2, JSON.toJSONString(map));
         } else {

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchMapper.java

@@ -35,4 +35,10 @@ public interface MsScanbatchMapper extends TkMapper<MsScanbatch> {
 
     //扫描记录-按批次
     List<Map<String,Object>> listRecordBatchStudents(@Param("params")ScanParams params);
+
+    //修改扫描数量
+    int updateScannum(@Param("batchid")Integer batchid);
+
+    //修改识别数量
+    int updateIdentifynum(@Param("batchid")Integer batchid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchPaperMapper.java

@@ -19,4 +19,10 @@ public interface MsScanbatchPaperMapper extends TkMapper<MsScanbatchPaper> {
 
     //查看原卷-试卷信息
     Map<String,Object> getScanPaperByMspid(@Param("mspid") Integer mspid);
+
+    //试卷标记为异常
+    Integer updatePaperErrortype(@Param("mspid") Integer mspid, @Param("errortype") Integer errortype);
+
+    //指定试卷和考号下未处理异常数量
+    Integer getErrorNumByMpidAndExamno(@Param("mpid") Integer mpid, @Param("examno") String examno);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentBlockMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷试卷学生题块 Mapper 接口
@@ -9,4 +12,13 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
  * @Date 2024-10-15
  */
 public interface MsPaperStudentBlockMapper extends TkMapper<MsPaperStudentBlock> {
+
+    //根据学生试卷ID清空作答及批阅信息
+    int updateStudentBlockQuestionByMpsid(@Param("mpsid")Integer mpsid);
+
+    //获取学生题块试题
+    List<MsPaperStudentBlock> listPaperStuBlockQuestions(@Param("mpsid")Integer mpsid);
+
+    //批量更改学生题块
+    int updateBatchStuBlock(@Param("list")List<MsPaperStudentBlock> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentMapper.java

@@ -1,7 +1,6 @@
 package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
 import com.xhkjedu.smarking.vo.exam.CStudentVo;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +18,7 @@ public interface MsPaperStudentMapper extends TkMapper<MsPaperStudent> {
 
     //获取学生科目试卷状态
     Integer getStateByStudentIdAndSubjectId(@Param("cs") CStudentVo cs);
+
+    //获取试卷学生信息
+    MsPaperStudent getPaperStudentByStudentidAndMpid(@Param("studentId") Integer studentId, @Param("mpId") Integer mpId);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentQuestionMergeMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.stupaper;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷试卷学生合并后试题表 Mapper 接口
@@ -9,4 +12,7 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge;
  * @Date 2024-10-15
  */
 public interface MsPaperStudentQuestionMergeMapper extends TkMapper<MsPaperStudentQuestionMerge> {
+
+    //批量修改学生试题
+    int updateBatchStuQues(@Param("list") List<MsPaperStudentQuestionMerge> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/system/UserMapper.java

@@ -39,4 +39,6 @@ public interface UserMapper {
 
     //获取用户信息用户操作日志
     UserVo getUserInfoForHandleLog(@Param("userid") Integer userid);
+
+
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaperQtypeQuestion.java

@@ -42,7 +42,7 @@ public class MsPaperQtypeQuestion extends BaseBean {
     //正确答案
     private String qanswer;
     //少选分值
-    private Integer loseoption;
+    private Double loseoption;
     //分值设置0默认1送分题 20分题
     private Integer scoreset;
     //试题难易度

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatch.java

@@ -24,8 +24,6 @@ public class MsScanbatch extends BaseBean {
     private Integer examid;
     //试卷id
     private Integer mpid;
-    //批次应扫张数
-    private Integer batchnum;
     //扫描总数量
     private Integer scannum;
     //上传数量

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaper.java

@@ -27,6 +27,9 @@ public class MsScanbatchPaper extends BaseBean {
     private String paperfront;
     //试卷反面
     private String paperback;
+
+    //扫描时第几张
+    private Integer pagenum;
     //是否识别0未识别1已识别
     private Integer identified;
     //考号
@@ -49,4 +52,7 @@ public class MsScanbatchPaper extends BaseBean {
     //扫描试卷块表
     @Transient
     private List<MsScanbatchPaperBlock> spblocks;
+
+    @Transient
+    private Integer mpid;//试卷ID
 }

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaperBlock.java

@@ -24,7 +24,7 @@ public class MsScanbatchPaperBlock extends BaseBean {
     //扫描试卷ID
     private Integer mspid;
     //题块ID
-    private Integer mpblockid;
+    private Integer mblockid;
     //图片
     private String picpath;
     //扩展图片

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaperBlockQuestion.java

@@ -19,8 +19,8 @@ public class MsScanbatchPaperBlockQuestion extends BaseBean {
     private Integer mspbqid;
     //扫描题块ID
     private Integer mspbid;
-    //合并试题ID
-    private Integer mpsqmid;
+    //题块试题ID
+    private Integer mbqid;
     //识别结果
     private String identifycont;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudent.java

@@ -55,14 +55,15 @@ public class MsPaperStudent extends BaseBean {
     private Integer batchid;
     //扫描批次下试卷ID
     private Integer mspid;
-    //学生答题卡图片
-    private String stupic;
+    //学生答题卡正面图片
+    private String paperfront;
+    //学生答题卡反面图片
+    private String paperback;
     //扫码时第几张
     private Integer pagenum;
     //设备web、pad
     private String device;
     //提交方式：1主动提交2自动提交3返回提交
     private Integer submittype;
-    //是否验证0待验证1验证通过2验证不通过
-    private Integer verified;
+
 }

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentBlock.java

@@ -5,6 +5,8 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description 阅卷试卷学生题块
@@ -25,8 +27,12 @@ public class MsPaperStudentBlock extends BaseBean {
     private Integer mblockid;
     //学生ID
     private Integer studentid;
+    //试卷学生ID
+    private Integer mpsid;
     //学生答案图片
     private String stuanswer;
+    //是否转换0未转换1已转换2转换失败
+    private Integer converted;
     //是否疑难卷0默认1是
     private Integer hasproblem;
     //疑难类型1图形模糊2答题错位3没有图像4图像颠倒5其他问题
@@ -37,10 +43,17 @@ public class MsPaperStudentBlock extends BaseBean {
     private Integer hasgood;
     //是否违规试卷0默认1是
     private Integer hasbad;
-    //是否最终批改结果
+    //是否最终批改结果0否1是
     private Integer hasfinal;
     //最终批改原因1仲裁2学科组成批
     private Integer finalreason;
     //创建时间
     private Integer createtime;
+
+    //学生题块下试题
+    @Transient
+    private List<MsPaperStudentQuestionMerge> questions;
+    //题块类型1客观题2主观题
+    @Transient
+    private Integer blocktype;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentQuestionMerge.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 阅卷试卷学生合并后试题表
@@ -29,6 +30,8 @@ public class MsPaperStudentQuestionMerge extends BaseBean {
     private Integer mpsid;
     //题块试题ID
     private Integer mbqid;
+    //试卷学生题块ID
+    private Integer mpsbid;
     //处理题型
     private Integer ctype;
     //试题id
@@ -83,4 +86,16 @@ public class MsPaperStudentQuestionMerge extends BaseBean {
     private Integer problemtype;
     //疑难备注
     private String problemcomm;
+
+    @Transient
+    private String qanswer;//试题答案
+    @Transient
+    private Integer hasanswer;//是否设置正确答案0未设置1已设置
+    //少选分值
+    @Transient
+    private Double loseoption;
+
+    //分值设置0默认1送分题 20分题
+    @Transient
+    private Integer scoreset;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -160,7 +160,7 @@ public class MsPaperQtypeService {
                     q.setOptionnum(0);
                 }
                 if (q.getLoseoption() == null) {
-                    q.setLoseoption(0);
+                    q.setLoseoption(0.0);
                 }
                 if (q.getScoreset() == null) {
                     q.setScoreset(0);

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -1,11 +1,22 @@
 package com.xhkjedu.smarking.service.scan;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockQuestionMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMergeMapper;
+import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlockQuestion;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudent;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge;
+import com.xhkjedu.smarking.utils.ConvertUtil;
+import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,20 +39,99 @@ public class MsScanbatchPaperService {
     private MsScanbatchPaperBlockMapper msScanbatchPaperBlockMapper;
     @Resource
     private MsScanbatchPaperBlockQuestionMapper msScanbatchPaperBlockQuestionMapper;
+    @Resource
+    private MsScanbatchMapper msScanbatchMapper;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private MsPaperStudentMapper msPaperStudentMapper;
+    @Resource
+    private MsPaperStudentQuestionMergeMapper msPaperStudentQuestionMergeMapper;
+    @Resource
+    private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
+    @Resource
+    private ConvertUtil convertUtil;
 
     /**
      * @Description 新增
      * @Param [msScanbatchPaper]
      * @Author auto
      * @Date 2024-10-15
-     * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
     public void add(MsScanbatchPaper msScanbatchPaper){
+        //保存一次，扫描次数加1
+        msScanbatchMapper.updateScannum(msScanbatchPaper.getBatchid());
+
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        msScanbatchPaper.setCreatetime(timestamp);
+
+        //获取考号
+        String examno = msScanbatchPaper.getExamno();
+        //考号不存在，异常信息2考号有误（异常类型1扫描出错 2考号有误 3考号重复 4缺考异常）
+        if(N_Utils.isEmpty(examno)){
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(2);
+            savePaperBlockQuestions(msScanbatchPaper);
+            return;
+        }
+
+        //考号存在，获取对应的试卷信息是否有异常，如果有则该条数据也标识为异常,异常信息3考号重复
+        Integer errorNum = msScanbatchPaperMapper.getErrorNumByMpidAndExamno(msScanbatchPaper.getMpid(),examno);
+        if(errorNum > 0){
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(3);
+            savePaperBlockQuestions(msScanbatchPaper);
+        }
+
+        //根据考号获取学生
+        Integer userid = userMapper.getUseridByExamno(examno);
+        //用户不存在，异常信息2考号有误
+        if(!N_Utils.isTrueInteger(userid)){
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(2);
+            savePaperBlockQuestions(msScanbatchPaper);
+            return;
+        }
+        //用户存在，获取用户试卷信息
+        MsPaperStudent msPaperStudent = msPaperStudentMapper.getPaperStudentByStudentidAndMpid(userid,msScanbatchPaper.getMpid());
+        //试卷不存在，异常信息1扫描出错
+        if(msPaperStudent == null){
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(1);
+            savePaperBlockQuestions(msScanbatchPaper);
+            return;
+        }
+        //试卷存在，判断学生是否已绑定扫描试卷信息，已有保存扫描信息本次异常，异常信息3考号重复
+        if(N_Utils.isTrueInteger(msPaperStudent.getMspid())){
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(3);
+            savePaperBlockQuestions(msScanbatchPaper);
+            //处理上一次对应扫描试卷为3考号重复，并清空学生试卷试题信息
+            msScanbatchPaperMapper.updatePaperErrortype(msPaperStudent.getMspid(),3);
+            updatePaperStudentQuestion(msPaperStudent);
+            return;
+        }
 
-        msScanbatchPaper.setCreatetime(N_Utils.getSecondTimestamp());
+
+        //保存扫描信息
+        savePaperBlockQuestions(msScanbatchPaper);
+        //学生试卷信息
+        int answernum = saveStudentBlockQuestions(msScanbatchPaper,msPaperStudent.getMpsid());
+        if (!N_Utils.isEmptyInteger(msScanbatchPaper.getMissexam()) && msScanbatchPaper.getMissexam() == 1 && answernum>0) {//缺考
+            //如果标记考试缺考，且答题数量大于0属于异常,异常信息4缺考异常
+            msScanbatchPaper.setHaserror(1);
+            msScanbatchPaper.setErrortype(4);
+            //修改扫描信息
+            msScanbatchPaperMapper.updatePaperErrortype(msPaperStudent.getMspid(),4);
+        }
+    }
+
+    //保存扫描试卷-保存扫描题块试题信息
+    private void savePaperBlockQuestions(MsScanbatchPaper msScanbatchPaper){
         msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
         Integer mspid = msScanbatchPaper.getId();
+        msScanbatchPaper.setMspid(mspid);
 
         //保存试题
         List<MsScanbatchPaperBlock> spblocks = msScanbatchPaper.getSpblocks();
@@ -60,7 +150,161 @@ public class MsScanbatchPaperService {
                 saveQuestions.add(spbquestion);
             }
         }
-        msScanbatchPaperBlockQuestionMapper.insertList(saveQuestions);
+        if(N_Utils.isListNotEmpty(saveQuestions)){
+            msScanbatchPaperBlockQuestionMapper.insertList(saveQuestions);
+        }
+        //更改识别数量
+        msScanbatchMapper.updateIdentifynum(msScanbatchPaper.getBatchid());
+
+    }
+
+    //保存扫描试卷-清空学生试卷题块试题信息
+    private void updatePaperStudentQuestion(MsPaperStudent msPaperStudent){
+        Integer mspid = msPaperStudent.getMspid();
+        //清空学生题块、试题 作答信息及批阅信息
+        msPaperStudentBlockMapper.updateStudentBlockQuestionByMpsid(mspid);
+
+        //清空学生试卷信息
+        MsPaperStudent ps = new MsPaperStudent();
+        ps.setBatchid(null);
+        ps.setMspid(null);
+        ps.setSstate(0);
+        ps.setChecked(0);
+        ps.setStuscore(0.0);
+        ps.setStuscoretype(0);
+        ps.setHasbad(0);
+        ps.setPaperfront(null);
+        ps.setPaperback(null);
+        ps.setPagenum(0);
+        ps.setMpsid(msPaperStudent.getMpsid());
+
+        msPaperStudentMapper.updateByPrimaryKeySelective(ps);
+    }
+
+    //保存扫描试卷-保存学生试卷题块信息
+    private int saveStudentBlockQuestions(MsScanbatchPaper msScanbatchPaper,Integer mpsid){
+        int rtnanswernum = 0;//试题数量
+
+        //扫描试卷中切割题块
+        List<MsScanbatchPaperBlock> spblocks = msScanbatchPaper.getSpblocks();
+
+        //学生题块试题信息
+        List<MsPaperStudentBlock> paperQuestions =msPaperStudentBlockMapper.listPaperStuBlockQuestions(mpsid);
+        //扫描的题块数量和学生试题题块数量不一致
+        if(spblocks.size() != paperQuestions.size()){
+            return -1;
+        }
+
+        Integer checknum = 0;//记录试卷中已批改题块数量
+        Double stuPaperScore = 0.0;//学生试卷得分
+        List<MsPaperStudentBlock>  saveBlockList = new ArrayList<>();// 保存学生题块信息
+        List<MsPaperStudentQuestionMerge> saveQuesList = new ArrayList<>();//保存学生提交试题
+        List<MsPaperStudentBlock> needConvertList = new ArrayList<>();//需要合并图片的题块
+        Integer timestamp = N_Utils.getSecondTimestamp();
+
+        for(MsScanbatchPaperBlock spblock : spblocks){
+            String picPath = spblock.getPicpath();
+            MsPaperStudentBlock studentBlock = paperQuestions.stream().filter(b -> b.getMblockid().equals(spblock.getMblockid())).findFirst().orElse(null);
+            studentBlock.setStuanswer(picPath);
+            List<String> stuPicList = JSON.parseArray(picPath, String.class);//判断有几张图片
+            Integer converted = 1;
+            if(stuPicList!= null && stuPicList.size() > 1){
+                converted = 0;
+            }
+            studentBlock.setConverted(0);
+            saveBlockList.add(studentBlock);
+            needConvertList.add(studentBlock);
+
+            List<MsPaperStudentQuestionMerge> stuQuestions = studentBlock.getQuestions();//学生试题
+            List<MsScanbatchPaperBlockQuestion> spbquestions = spblock.getSpbquestions();//扫描题块下试题
+            if(studentBlock.getBlocktype() == 1){
+                //说明是客观题题块,需要自动批改
+
+                for(MsScanbatchPaperBlockQuestion spbquestion : spbquestions) {
+                    //试题答案
+                    MsPaperStudentQuestionMerge queAnswer = stuQuestions.stream().filter(q -> q.getMbqid().equals(spbquestion.getMbqid())).findFirst().orElse(null);
+
+                    //扫描结果
+                    MsPaperStudentQuestionMerge stuQuestion = new MsPaperStudentQuestionMerge();
+                    stuQuestion.setStuanswer(spbquestion.getIdentifycont());
+                    stuQuestion.setMbqid(spbquestion.getMbqid());
+                    stuQuestion.setMpsqmid(queAnswer.getMpsqmid());
+                    stuQuestion.setAnswertime(timestamp);
+                    stuQuestion.setConverted(1);
+                    stuQuestion.setAnswertype(1);
+                    MarkingUtil.checkObjectiveQuestion(stuQuestion, queAnswer);
+                    if(stuQuestion.getChecked() == 2){
+                        checknum++;
+                    }
+                    stuPaperScore = MarkingUtil.add(stuPaperScore, stuQuestion.getStuscore());
+
+                    saveQuesList.add(stuQuestion);
+                }
+            }else{
+                //主观题
+                for(MsScanbatchPaperBlockQuestion spbquestion : spbquestions){
+                    //试题答案
+                    MsPaperStudentQuestionMerge queAnswer = stuQuestions.stream().filter(q -> q.getMbqid().equals(spbquestion.getMbqid())).findFirst().orElse(null);
+                    MsPaperStudentQuestionMerge stuQuestion = new MsPaperStudentQuestionMerge();
+                    stuQuestion.setMpsqmid(queAnswer.getMpsqmid());
+                    stuQuestion.setStuanswer(picPath);
+                    stuQuestion.setAnswertype(2);
+                    stuQuestion.setAnswered(1);
+                    stuQuestion.setAnswertime(timestamp);
+                    stuQuestion.setConverted(converted);
+                    //如果多图，需要合并
+                    saveQuesList.add(stuQuestion);
+                }
+            }
+            //保存需要合并的试题信息，合并后保存
+        }
+
+        //处理试卷信息
+        MsPaperStudent msPaperStudent = new MsPaperStudent();
+        msPaperStudent.setMpsid(mpsid);
+        msPaperStudent.setEndtime(timestamp);
+        msPaperStudent.setBatchid(msScanbatchPaper.getBatchid());
+        msPaperStudent.setMspid(msScanbatchPaper.getMspid());
+        msPaperStudent.setCosttime(0);
+        msPaperStudent.setPaperfront(msScanbatchPaper.getPaperfront());
+        msPaperStudent.setPaperback(msScanbatchPaper.getPaperback());
+        msPaperStudent.setPagenum(msScanbatchPaper.getPagenum());
+        msPaperStudent.setStuscore(stuPaperScore);
+        msPaperStudent.setStuscoretype(1);
+        if(msScanbatchPaper.getMissexam() == 1){
+            //缺考
+            msPaperStudent.setSstate(3);//状态0未进场1已进场2已交卷3缺考
+        }else{
+            msPaperStudent.setSstate(2);//状态0未进场1已进场2已交卷3缺考
+        }
+        if(msScanbatchPaper.getViolated() == 1){
+            msPaperStudent.setHasbad(1);
+        }
+        if(checknum == saveQuesList.size()){
+            msPaperStudent.setChecked(2);
+        }
+
+        //批量修改试卷题块、试题信息
+        msPaperStudentBlockMapper.updateBatchStuBlock(saveBlockList);
+        msPaperStudentQuestionMergeMapper.updateBatchStuQues(saveQuesList);
+        msPaperStudentMapper.updateByPrimaryKeySelective(msPaperStudent);
+        handleStudentNeedConvert(needConvertList);
+
+        rtnanswernum = saveQuesList.size();
+
+        return rtnanswernum;
+    }
+
+    private void handleStudentNeedConvert(List<MsPaperStudentBlock> needConvertList){
+        if(needConvertList.size() > 0){
+            for(MsPaperStudentBlock studentBlock : needConvertList){
+                String stuAnswer = studentBlock.getStuanswer();
+                List<String> stuPicList = JSON.parseArray(stuAnswer, String.class);
+                if(stuPicList != null && stuPicList.size() > 1){
+                    convertUtil.imgMerge(studentBlock.getMpsbid(),stuPicList,2);
+                }
+            }
+        }
     }
 
 

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchService.java

@@ -51,7 +51,6 @@ public class MsScanbatchService {
         msScanbatch.setBatchname(batchname);
         msScanbatch.setExamid(examid);
         msScanbatch.setCreatetime(N_Utils.getSecondTimestamp());
-        msScanbatch.setBatchnum(0);
         msScanbatch.setScannum(0);
         msScanbatch.setUploadnum(0);
         msScanbatch.setIdentifynum(0);

smarking/src/main/java/com/xhkjedu/smarking/utils/ConvertUtil.java

@@ -26,8 +26,8 @@ public class ConvertUtil {
      * @author ywx
      * @date 2022/5/9 14:57
      */
-    public void imgMerge(Integer psqid, List<String> userAnswers, Integer device) {
-        messageSender.imgMerge(psqid, userAnswers, device);
+    public void imgMerge(Integer mpsbid, List<String> userAnswers, Integer device) {
+        messageSender.imgMerge(mpsbid, userAnswers, device);
     }
 
     /**

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -1,5 +1,11 @@
 package com.xhkjedu.smarking.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge;
+import com.xhkjedu.utils.N_Utils;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
@@ -51,4 +57,106 @@ public class MarkingUtil {
         }
         return textStr;// 返回文本字符串
     }
+
+    /*
+     * @Description 判断两个字符串的关系
+     * @Date 2024/10/29 10:23:58
+     * @Author WN
+     * @Param [str1, str2]
+     * @Return int
+     **/
+    public static int isEqualStringCheck(String str1,String str2){
+        char[] charArray1 = str1.toCharArray();
+        char[] charArray2 = str2.toCharArray();
+        Arrays.sort(charArray1);
+        Arrays.sort(charArray2);
+        int eqResult = 0;//0代表不相等 1表示两个字符串相等 2代表字符串1包含字符串2
+        if(Arrays.equals(charArray1, charArray2)){
+            eqResult = 1;
+        }
+
+        if(Arrays.asList(charArray1).containsAll(Arrays.asList(charArray2))){
+            eqResult = 2;
+        }
+
+        return eqResult;
+    }
+
+    /*
+     * @Description 客观题自动批阅（扫描）
+     * @Date 2024/10/29 10:34:54
+     * @Author WN
+     * @Param [stuQuestion 学生作答, queAnswer 试题答案]
+     * @Return void
+     **/
+    public static void checkObjectiveQuestion(MsPaperStudentQuestionMerge stuQuestion,MsPaperStudentQuestionMerge queAnswer){
+        String stuAnswer = stuQuestion.getStuanswer();
+        Double stuScore = 0D;
+        Integer timestamp = N_Utils.getSecondTimestamp();
+
+        //学生答案为空时
+        if(N_Utils.isEmpty(stuAnswer)){
+            stuQuestion.setAnswered(0);
+            stuQuestion.setStuanswer(null);
+            stuQuestion.setStuscore(stuScore);
+            stuQuestion.setChecked(2);
+            stuQuestion.setFirstcime(timestamp);
+            stuQuestion.setFirstccore(stuScore);
+        }else{
+            //如果试题进行了得分设置，则直接进行分值处理(分值设置0默认1送分题 20分题)
+            Integer scoreset = queAnswer.getScoreset();
+            if(N_Utils.isTrueInteger(scoreset)){
+                if(scoreset == 1){
+                    stuScore = queAnswer.getQscore();
+                }
+            }else{
+                //未进行分值设置
+                //学生答案不为空，试卷设置了正确答案
+                if(queAnswer.getHasanswer()!=null && queAnswer.getHasanswer() == 1){
+                    String qanswer = JSON.parseArray(queAnswer.getQanswer(), String.class).get(0);//试题正确答案
+                    int ctype = queAnswer.getCtype();
+                    Double qscore = queAnswer.getQscore();
+                    if(N_Utils.isObjectiveQuestion(ctype)){
+                        //客观题进行批阅
+                        if(ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6){
+                            //单选题、判断题进行判断
+                            if(stuAnswer.equalsIgnoreCase(qanswer)){
+                                stuScore = qscore;
+                            }
+                        }else if(ctype == 2){
+                            //多选题进行判断，
+                            Double lostoption = queAnswer.getLoseoption();//少选分值
+                            int isEqualStr = isEqualStringCheck(qanswer, stuAnswer);
+                            if(isEqualStr == 1){
+                                stuScore = qscore;
+                            }else if(isEqualStr == 2){
+                                stuScore = lostoption;//少选得分
+                            }
+
+                        }
+                        stuQuestion.setChecked(2);
+                        stuQuestion.setFirstcime(timestamp);
+                    }
+
+                }else{
+                    stuQuestion.setChecked(0);
+                }
+            }
+            stuQuestion.setStuscore(stuScore);
+            stuQuestion.setAnswered(1);
+        }
+    }
+
+    /**
+     * 提供精确的加法运算。
+     *
+     * @param v1 被加数
+     * @param v2 加数
+     * @return 两个参数的和
+     */
+    public static double add(double v1, double v2) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.add(b2).doubleValue();
+    }
 }

smarking/src/main/resources/mapper/scan/MsScanbatchMapper.xml

@@ -80,4 +80,13 @@
         order by b.batchid,sp.mspid
     </select>
 
+    <!--修改扫描数量-->
+    <update id="updateScannum">
+        update ms_scanbatch set scannum=scannum+1 where batchid=#{batchid}
+    </update>
+    <!--修改识别数量-->
+    <update id="updateIdentifynum">
+        update ms_scanbatch_paper set identified=(select count(*) from ms_scanbatch_paper where batchid=#{batchid} and identified=1) where batchid=#{batchid} and mspid=#{mspid}
+    </update>
+
 </mapper>

smarking/src/main/resources/mapper/scan/MsScanbatchPaperBlockMapper.xml

@@ -12,13 +12,13 @@
         <result property="msptype" column="msptype"/>
         <collection property="questions" ofType="java.util.Map" javaType="java.util.ArrayList">
             <result property="mspbqid" column="mspbqid"/>
-            <result property="mpsqmid" column="mpsqmid"/>
+            <result property="mbqid" column="mbqid"/>
             <result property="identifycont" column="identifycont"/>
         </collection>
     </resultMap>
     <select id="listObjectiveQuestions" resultMap="objectiveQuestions">
         select b.mspbid,b.mpblockid,b.picpath,b.extendpath,b.identifycont,b.msptype
-        ,q.mspbqid,q.mpsqmid,q.identifycont
+        ,q.mspbqid,q.mbqid,q.identifycont
         from ms_scanbatch_paper_block b
         left join ms_scanbatch_paper_block_question q on b.mspbid=q.mspbid
         where b.mspid=#{mspid} and b.msptype=1 order by b.mspbid,q.mspbqid

smarking/src/main/resources/mapper/scan/MsScanbatchPaperBlockQuestionMapper.xml

@@ -2,3 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockQuestionMapper">
 </mapper>
+

smarking/src/main/resources/mapper/scan/MsScanbatchPaperMapper.xml

@@ -10,4 +10,16 @@
     <select id="getScanPaperByMspid" resultType="java.util.Map">
         select * from ms_scanbatch_paper where mspid = #{mspid}
     </select>
+
+    <!--试卷标记为异常-->
+    <update id="updatePaperErrortype">
+        update ms_scanbatch_paper set errortype = #{errortype} and haserror=1 where mspid = #{mspid}
+    </update>
+
+    <!--指定试卷和考号下未处理异常数量-->
+    <select id="getErrorNumByMpidAndExamno" resultType="java.lang.Integer">
+        select count(p.mspid) from ms_scanbatch_paper p left join ms_scanbatch b on p.batchid=b.batchid
+        where b.mpid=#{mpid} and p.examno=#{examno} and p.haserror=1 and p.mspstate=0
+    </select>
+
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentBlockMapper.xml

@@ -1,4 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper">
+
+    <!--根据学生试卷ID清空作答及批阅信息-->
+    <update id="updateStudentBlockQuestionByMpsid">
+        update ms_paper_student_block b join ms_paper_student_question_merge q
+        on b.mpsid=q.mpsid and b.mpsbid=q.mpsbid
+        set b.stuanswer=null,b.hasproblem=0,b.problemtype=0,b.problemcomm=null,b.hasgood=0,
+        b.hasbad=0,b.hasfinal=0,b.finalreason=0,
+        q.answered=0,q.answertype=0,q.stuanswer=null,q.converted=0,q.answertime=0,q.stuscore=0,
+        q.checked=0,q.firstcid=null,q.firstcime=null,q.firstccore=0,q.secondcid=null,q.secondctime=null,q.secondcscore=0,q.arbitrateid=null,q.arbitratetime=null,q.arbitratescore=0,q.hasgood=0,
+        q.hasbad=0,q.hasproblem=0,q.problemtype=0,q.problemcomm=null
+        where b.mpsid = #{mpsid}
+    </update>
+
+    <!--获取学生题块试题-->
+    <resultMap id="stuBlockQuestions" type="com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock">
+        <result property="mpsbid" column="mpsbid"/>
+        <result property="mpsid" column="mpsid"/>
+        <result property="mpid" column="mpid"/>
+        <result property="mblockid" column="mblockid"/>
+        <result property="stuanswer" column="stuanswer"/>
+        <result property="blocktype" column="blocktype"/>
+        <collection property="questions" ofType="com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge" javaType="java.util.List">
+            <result property="mpsqmid" column="mpsqmid"/>
+            <result property="mbqid" column="mbqid"/>
+            <result property="mpsbid" column="mpsbid"/>
+            <result property="qn" column="qn"/>
+            <result property="qorder" column="qorder"/>
+            <result property="qscore" column="qscore"/>
+            <result property="ctype" column="ctype"/>
+            <result property="qanswer" column="qanswer"/>
+            <result property="loseoption" column="loseoption"/>
+            <result property="scoreset" column="scoreset"/>
+            <result property="hasanswer" column="answered"/>
+
+        </collection>
+    </resultMap>
+    <select id="listPaperStuBlockQuestions" resultMap="stuBlockQuestions">
+        select distinct b.mpsbid,b.mpsid,b.mpid,b.mblockid,b.stuanswer,pb.blocktype,q.mpsqmid,q.mbqid,q.mpsbid,q.qn,q.qorder,
+                        q.qscore,q.ctype,tq.qanswer,tq.loseoption,tq.scoreset,p.answered
+        from ms_paper_student_question_merge q leftjoin ms_paper_student_block b
+        on b.mpsid=q.mpsid and b.mpsbid=q.mpsbid
+        left join ms_paper_block pb on pb.mblockid=b.mblockid
+        left join ms_paper_block_question pbq on q.mbqid=pbq.mbqid
+        left join ms_paper_qtype_question tq on pbq.mptqid=tq.mptqid
+        left join ms_paper p on p.mpid=b.mpid
+        where b.mpsid = #{mpsid}
+    </select>
+
+    <!--批量更改学生题块-->
+    <update id="updateBatchStuBlock">
+        <foreach collection="list" separator=";" item="b">
+            update ms_paper_student_block set stuanswer=#{b.stuanswer},converted=#{b.converted} where mpsbid=#{b.mpsbid}
+        </foreach>
+    </update>
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -14,4 +14,9 @@
         select sstate
         from ms_paper_student where examid=#{cs.examid} and subjectid=#{cs.subjectid} and studentid=#{cs.studentid}
     </select>
+
+    <!--获取试卷学生信息-->
+    <select id="getPaperStudentByStudentidAndMpid" resultType="com.xhkjedu.smarking.model.stupaper.MsPaperStudent">
+        select * from ms_paper_student where studentid=#{studentid} and mpid=#{mpid} order by mpsid limit 1
+    </select>
 </mapper>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMergeMapper.xml

@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMergeMapper">
+
+    <!--批量修改学生试题-->
+    <update id="updateBatchStuQues">
+        <foreach collection="list" item="q" separator="; ">
+            update ms_paper_student_question set answered = #{q.answered},answertype = #{q.answertype},stuanswer = #{q.stuanswer},
+            converted= #{q.converted},answertime = #{q.answertime},costtime = #{q.costtime},stuscore = #{q.stuscore},
+            checked = #{q.checked},firstcime = #{q.firstcime},firstccore = #{q.firstccore} where mpsqmid = #{q.mpsqmid}
+        </foreach>
+    </update>
 </mapper>