扫描记录相关内容

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

@@ -33,6 +33,11 @@ public class ScantronService {
     //答题卡-保存
     public void save(TScantron tScantron){
         tScantron.setCreatetime(N_Utils.getSecondTimestamp());
+        if(tScantron.getSlayout() > 1){
+            tScantron.setPapertype(1);
+        }else{
+            tScantron.setPapertype(2);
+        }
         scantronMapper.insertSelective(tScantron);
     }
     //答题卡-修改

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.service.scan.MsScanbatchService;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -30,7 +31,7 @@ public class MsScanbatchController {
     private MsScanbatchService msScanbatchService;
 
     /**
-     * @Description 新增
+     * @Description 新增扫描试卷
      * @Param [msScanbatch]
      * @Author auto
      * @Date 2024-10-15
@@ -75,4 +76,83 @@ public class MsScanbatchController {
         Map<String, Object> map = msScanbatchService.getExamPaperScanInfo(mpid);
         return new ResultVo(0, "查询成功", map);
     }
+
+    /*
+     * @Description 扫描记录-扫描信息、考试班级、扫描批次
+     * @Date 2024/10/25 14:49:07
+     * @Author WN
+     * @Param [msScanbatch]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/record_info")
+    public ResultVo getScanPaperRecordInfo(@RequestBody MsScanbatch msScanbatch) {
+        Integer mpid = msScanbatch.getMpid();
+        N_Utils.validation(new Object[]{mpid, "试卷id", 1});
+        Map<String, Object> map = msScanbatchService.getScanRecordAndClass(mpid);
+        return new ResultVo(0, "查询成功", map);
+    }
+
+    /*
+     * @Description 扫描记录-按班级
+     * @Date 2024/10/25 16:51:59
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/record_class")
+    public ResultVo listRecordClassStudents(@RequestBody ScanParams params) {
+        Integer page = params.getPage();
+        Integer pageSize = params.getPageSize();
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,params.getExamid(),"考试id",1,page, "显示页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map<String, Object>> list = msScanbatchService.listRecordClassStudents(params);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "查询成功", pageResult);
+    }
+
+    /*
+     * @Description 扫描记录-按班级-导出
+     * @Date 2024/10/25 17:00:23
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/record_class_export")
+    public ResultVo listRecordClassStudentsExpport(@RequestBody ScanParams params) {
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,params.getExamid(),"考试id",1});
+        List<Map<String, Object>> list = msScanbatchService.listRecordClassStudents(params);
+        return new ResultVo(0, "查询成功", list);
+    }
+
+    /*
+     * @Description 扫描记录-按班级
+     * @Date 2024/10/25 16:55:40
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/record_batch")
+    public ResultVo listRecordBatchStudents(@RequestBody ScanParams params) {
+        Integer page = params.getPage();
+        Integer pageSize = params.getPageSize();
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,params.getExamid(),"考试id",1,page, "显示页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map<String, Object>> list = msScanbatchService.listRecordBatchStudents(params);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "查询成功", pageResult);
+    }
+
+    /*
+     * @Description 扫描记录-按班级-导出
+     * @Date 2024/10/25 17:01:09
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/record_batch_export")
+    public ResultVo listRecordBatchStudentsExport(@RequestBody ScanParams params) {
+        N_Utils.validation(new Object[]{params.getMpid(), "试卷id", 1,params.getExamid(),"考试id",1});
+        List<Map<String, Object>> list = msScanbatchService.listRecordBatchStudents(params);
+        return new ResultVo(0, "查询成功", list);
+    }
 }

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

@@ -1,57 +0,0 @@
-package com.xhkjedu.smarking.controller.scan;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
-import com.xhkjedu.smarking.service.scan.MsScanbatchPaperBlockService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷扫描客试卷题块表相关操作
- * @Author auto
- * @Date 2024-10-15
- */
-@RestController
-@RequestMapping("/msScanbatchPaperBlock")
-public class MsScanbatchPaperBlockController {
-    @Resource
-    private MsScanbatchPaperBlockService msScanbatchPaperBlockService;
-
-    /**
-     * @Description 新增
-     * @Param [msScanbatchPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsScanbatchPaperBlock msScanbatchPaperBlock) {
-        msScanbatchPaperBlockService.add(msScanbatchPaperBlock);
-        return new ResultVo(0, "保存成功！");
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msScanbatchPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsScanbatchPaperBlock msScanbatchPaperBlock) {
-        Integer page = msScanbatchPaperBlock.getPage();
-        Integer size = msScanbatchPaperBlock.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsScanbatchPaperBlock> list = msScanbatchPaperBlockService.queryList(msScanbatchPaperBlock);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.xhkjedu.smarking.controller.scan;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlockQuestion;
-import com.xhkjedu.smarking.service.scan.MsScanbatchPaperBlockQuestionService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷扫描试卷题块试题识别表相关操作
- * @Author auto
- * @Date 2024-10-15
- */
-@RestController
-@RequestMapping("/msScanbatchPaperBlockQuestion")
-public class MsScanbatchPaperBlockQuestionController {
-    @Resource
-    private MsScanbatchPaperBlockQuestionService msScanbatchPaperBlockQuestionService;
-
-    /**
-     * @Description 新增
-     * @Param [msScanbatchPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsScanbatchPaperBlockQuestion msScanbatchPaperBlockQuestion) {
-        msScanbatchPaperBlockQuestionService.add(msScanbatchPaperBlockQuestion);
-        return new ResultVo(0, "保存成功！");
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msScanbatchPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsScanbatchPaperBlockQuestion msScanbatchPaperBlockQuestion) {
-        Integer page = msScanbatchPaperBlockQuestion.getPage();
-        Integer size = msScanbatchPaperBlockQuestion.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsScanbatchPaperBlockQuestion> list = msScanbatchPaperBlockQuestionService.queryList(msScanbatchPaperBlockQuestion);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-}

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

@@ -1,17 +1,16 @@
 package com.xhkjedu.smarking.controller.scan;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.service.scan.MsScanbatchPaperService;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 批阅扫描试卷表相关操作
@@ -19,39 +18,27 @@ import java.util.List;
  * @Date 2024-10-15
  */
 @RestController
-@RequestMapping("/msScanbatchPaper")
+@RequestMapping("/mscanp")
 public class MsScanbatchPaperController {
     @Resource
     private MsScanbatchPaperService msScanbatchPaperService;
 
-    /**
-     * @Description 新增
-     * @Param [msScanbatchPaper]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsScanbatchPaper msScanbatchPaper) {
-        msScanbatchPaperService.add(msScanbatchPaper);
-        return new ResultVo(0, "保存成功！");
-    }
 
-    /**
-     * @Description 列表
+
+
+    /*
+     * @Description 扫描记录-查看原卷
+     * @Date 2024/10/25 17:24:18
+     * @Author WN
      * @Param [msScanbatchPaper]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
+     * @Return com.xhkjedu.vo.ResultVo
      **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsScanbatchPaper msScanbatchPaper) {
-        Integer page = msScanbatchPaper.getPage();
-        Integer size = msScanbatchPaper.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsScanbatchPaper> list = msScanbatchPaperService.queryList(msScanbatchPaper);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+    @PostMapping("/paper")
+    public ResultVo getScanPaper(@RequestBody MsScanbatchPaper msScanbatchPaper) {
+        Integer mspid = msScanbatchPaper.getMspid();
+        N_Utils.validation(new Object[]{mspid, "扫描试卷id", 1});
+        Map<String, Object> map = msScanbatchPaperService.getScanPaperQuestion(mspid);
+        return new ResultVo(0, "获取成功", map);
     }
+
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.scan;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -25,4 +26,13 @@ public interface MsScanbatchMapper extends TkMapper<MsScanbatch> {
 
     //获取试卷所有扫描批次
     List<Map<String,Object>> listScanBatchByMpidForSel(@Param("mpid")Integer mpid);
+
+    //扫描记录-扫描信息
+    Map<String,Object> getScanPaperRecord(@Param("mpid")Integer mpid);
+
+    //扫描记录-按班级
+    List<Map<String,Object>> listRecordClassStudents(@Param("params")ScanParams params);
+
+    //扫描记录-按批次
+    List<Map<String,Object>> listRecordBatchStudents(@Param("params")ScanParams params);
 }

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

@@ -2,6 +2,10 @@ package com.xhkjedu.smarking.mapper.scan;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷扫描客试卷题块表 Mapper 接口
@@ -9,4 +13,10 @@ import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
  * @Date 2024-10-15
  */
 public interface MsScanbatchPaperBlockMapper extends TkMapper<MsScanbatchPaperBlock> {
+
+    //扫描记录-查看原卷-客观题
+    List<Map<String,Object>> listObjectiveQuestions(@Param("mspid")Integer mspid);
+
+    //扫描记录-查看原卷-主观题
+    List<Map<String,Object>> listSubjectiveQuestions(@Param("mspid")Integer mspid);
 }

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

@@ -5,6 +5,7 @@ import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 批阅扫描试卷表 Mapper 接口
@@ -15,4 +16,7 @@ public interface MsScanbatchPaperMapper extends TkMapper<MsScanbatchPaper> {
 
     //获取批次下所有试卷
     List<MsScanbatchPaper> listPaperByBatchid(@Param("batchid") Integer batchid);
+
+    //查看原卷-试卷信息
+    Map<String,Object> getScanPaperByMspid(@Param("mspid") Integer mspid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaper.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 批阅扫描试卷表
@@ -43,4 +45,8 @@ public class MsScanbatchPaper extends BaseBean {
     private Integer mspstate;
     //保存时间
     private Integer createtime;
+
+    //扫描试卷块表
+    @Transient
+    private List<MsScanbatchPaperBlock> spblocks;
 }

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaperBlock.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 阅卷扫描客试卷题块表
@@ -28,7 +30,11 @@ public class MsScanbatchPaperBlock extends BaseBean {
     //扩展图片
     private String extendpath;
     //识别结果
-    private String identify;
+    private String identifycont;
     //题块试题类型1客观题 2主观题
     private Integer msptype;
+
+    //扫描试卷客观题
+    @Transient
+    private List<MsScanbatchPaperBlockQuestion> spbquestions;
 }

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

@@ -22,5 +22,5 @@ public class MsScanbatchPaperBlockQuestion extends BaseBean {
     //合并试题ID
     private Integer mpsqmid;
     //识别结果
-    private String identify;
+    private String identifycont;
 }

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

@@ -51,8 +51,10 @@ public class MsPaperStudent extends BaseBean {
     private Integer hasbad;
     //创建时间
     private Integer createtime;
-    //扫描批次id
+    //扫描批次ID
     private Integer batchid;
+    //扫描批次下试卷ID
+    private Integer mspid;
     //学生答题卡图片
     private String stupic;
     //扫码时第几张

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

@@ -1,41 +0,0 @@
-package com.xhkjedu.smarking.service.scan;
-
-import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockQuestionMapper;
-import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlockQuestion;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷扫描试卷题块试题识别表 服务实现类
- * @Author auto
- * @Date 2024-10-15
- */
-@Service
-public class MsScanbatchPaperBlockQuestionService {
-    @Resource
-    private MsScanbatchPaperBlockQuestionMapper msScanbatchPaperBlockQuestionMapper;
-
-    /**
-     * @Description 新增
-     * @Param [msScanbatchPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
-     **/
-    public void add(MsScanbatchPaperBlockQuestion msScanbatchPaperBlockQuestion){
-        msScanbatchPaperBlockQuestionMapper.insert(msScanbatchPaperBlockQuestion);
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msScanbatchPaperBlockQuestion]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlockQuestion>
-     **/
-    public List<MsScanbatchPaperBlockQuestion> queryList(MsScanbatchPaperBlockQuestion msScanbatchPaperBlockQuestion){
-        return msScanbatchPaperBlockQuestionMapper.selectAll();
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.xhkjedu.smarking.service.scan;
-
-import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockMapper;
-import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷扫描客试卷题块表 服务实现类
- * @Author auto
- * @Date 2024-10-15
- */
-@Service
-public class MsScanbatchPaperBlockService {
-    @Resource
-    private MsScanbatchPaperBlockMapper msScanbatchPaperBlockMapper;
-
-    /**
-     * @Description 新增
-     * @Param [msScanbatchPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
-     **/
-    public void add(MsScanbatchPaperBlock msScanbatchPaperBlock){
-        msScanbatchPaperBlockMapper.insert(msScanbatchPaperBlock);
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msScanbatchPaperBlock]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock>
-     **/
-    public List<MsScanbatchPaperBlock> queryList(MsScanbatchPaperBlock msScanbatchPaperBlock){
-        return msScanbatchPaperBlockMapper.selectAll();
-    }
-}

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

@@ -1,11 +1,19 @@
 package com.xhkjedu.smarking.service.scan;
 
+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.model.scan.MsScanbatchPaper;
+import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
+import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlockQuestion;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 批阅扫描试卷表 服务实现类
@@ -16,6 +24,10 @@ import java.util.List;
 public class MsScanbatchPaperService {
     @Resource
     private MsScanbatchPaperMapper msScanbatchPaperMapper;
+    @Resource
+    private MsScanbatchPaperBlockMapper msScanbatchPaperBlockMapper;
+    @Resource
+    private MsScanbatchPaperBlockQuestionMapper msScanbatchPaperBlockQuestionMapper;
 
     /**
      * @Description 新增
@@ -24,18 +36,50 @@ public class MsScanbatchPaperService {
      * @Date 2024-10-15
      * @return void
      **/
+    @Transactional(rollbackFor = Exception.class)
     public void add(MsScanbatchPaper msScanbatchPaper){
-        msScanbatchPaperMapper.insert(msScanbatchPaper);
+
+        msScanbatchPaper.setCreatetime(N_Utils.getSecondTimestamp());
+        msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
+        Integer mspid = msScanbatchPaper.getId();
+
+        //保存试题
+        List<MsScanbatchPaperBlock> spblocks = msScanbatchPaper.getSpblocks();
+        for (MsScanbatchPaperBlock spblock : spblocks) {
+            spblock.setMspid(mspid);
+            spblock.setBatchid(msScanbatchPaper.getBatchid());
+        }
+
+        msScanbatchPaperBlockMapper.insertList(spblocks);
+        List<MsScanbatchPaperBlockQuestion> saveQuestions = new ArrayList<>();
+        for (MsScanbatchPaperBlock spblock : spblocks) {
+            Integer spbid = spblock.getId();
+            List<MsScanbatchPaperBlockQuestion> spbquestions = spblock.getSpbquestions();
+            for (MsScanbatchPaperBlockQuestion spbquestion : spbquestions) {
+                spbquestion.setMspbid(spbid);
+                saveQuestions.add(spbquestion);
+            }
+        }
+        msScanbatchPaperBlockQuestionMapper.insertList(saveQuestions);
     }
 
-    /**
-     * @Description 列表
-     * @Param [msScanbatchPaper]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.scan.MsScanbatchPaper>
+
+    /*
+     * @Description 扫描记录-查看原卷
+     * @Date 2024/10/25 17:22:45
+     * @Author WN
+     * @Param [mspid]
+     * @Return java.util.Map<java.lang.String,java.lang.Object>
      **/
-    public List<MsScanbatchPaper> queryList(MsScanbatchPaper msScanbatchPaper){
-        return msScanbatchPaperMapper.selectAll();
+    public Map<String,Object> getScanPaperQuestion(Integer mspid){
+        Map<String,Object> map = msScanbatchPaperMapper.getScanPaperByMspid(mspid);
+        //获取试卷中客观题
+        List<Map<String,Object>> objectives = msScanbatchPaperBlockMapper.listObjectiveQuestions(mspid);
+        map.put("objectives",objectives);
+        //获取试卷中主观题
+        List<Map<String,Object>> subjectives = msScanbatchPaperBlockMapper.listSubjectiveQuestions(mspid);
+        map.put("subjectives",subjectives);
+
+        return map;
     }
 }

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

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatch;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
+import com.xhkjedu.smarking.vo.scan.ScanParams;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
@@ -74,7 +75,7 @@ public class MsScanbatchService {
     }
 
     /*
-     * @Description 扫描答题卡
+     * @Description 扫描答卷
      * @Date 2024/10/24 15:09:33
      * @Author WN
      * @Param [mpid]
@@ -88,14 +89,46 @@ public class MsScanbatchService {
         return rtnMap;
     }
 
+    /*
+     * @Description 扫描记录-扫描信息、考试班级、扫描批次
+     * @Date 2024/10/25 14:47:51
+     * @Author WN
+     * @Param [mpid]
+     * @Return java.util.Map<java.lang.String,java.lang.Object>
+     **/
     public Map<String,Object> getScanRecordAndClass(Integer mpid){
-        Map<String,Object> map = null;
+        Map<String,Object> map = msScanbatchMapper.getScanPaperRecord(mpid);
 
         //试卷扫描批次集合
         List<Map<String,Object>> scans = msScanbatchMapper.listScanBatchByMpidForSel(mpid);
         //参加考试的班级
+        List<Map> classes = msClassMapper.listByExamId(Integer.parseInt(map.get("examid").toString()), map.get("subjectid").toString());
+        map.put("scans",scans);
+        map.put("classes",classes);
 
         return map;
     }
 
+    /*
+     * @Description 扫描记录-按班级
+     * @Date 2024/10/25 16:50:44
+     * @Author WN
+     * @Param [params]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listRecordClassStudents(ScanParams params){
+        return msScanbatchMapper.listRecordClassStudents(params);
+    }
+
+    /*
+     * @Description 扫描记录-按批次
+     * @Date 2024/10/25 16:54:57
+     * @Author WN
+     * @Param [params]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> listRecordBatchStudents(ScanParams params){
+        return msScanbatchMapper.listRecordBatchStudents(params);
+    }
+
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/ScanParams.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.smarking.vo.scan;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+/**
+ * @Description：扫描参数
+ * @Author: WN
+ * @Date: 2024/10/25 15:00:20
+ **/
+@Data
+public class ScanParams extends BaseBean {
+    private Integer examid;//考试ID
+
+    private Integer mpid;//试卷ID
+
+    private Integer classid;//班级ID
+
+    private Integer batchid;//批次ID
+
+    private Integer hasscan;//是否扫描1已扫2未扫
+
+    private Integer hasidentify;//是否识别1已识别2未识别
+}

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

@@ -27,4 +27,57 @@
         select batchid,batchname from ms_scanbatch where mpid=#{mpid} order by batchid
     </select>
 
+    <!--扫描记录-扫描信息-->
+    <select id="getScanPaperRecord" resultType="java.util.Map">
+        select e.examid,e.examname,e.gradeid,e.exammode,s.subjectid,s.subjectname,s.msid,sum(b.scannum) scannum,
+        (select count(*) from ms_class_student where examid=e.examid and subjectid=s.subjectid) stunum,
+        (select count(*) from ms_paper_student where mpid=b.mpid and batchid is not null) identifynum
+        from ms_exam e left join ms_subject s on e.examid=s.examid
+        left join ms_paper p on s.msid=p.msid
+        left join  ms_scanbatch b on e.examid and p.mpid=b.mpid
+        where b.mpid=#{mpid} group by b.mpid
+    </select>
+
+    <!--扫描记录-按班级-->
+    <select id="listRecordClassStudents" resultType="java.util.Map">
+        select distinct cs.studentid,cs.classid,s.classname,u.username studentname,u.examno,
+        ps.batchid,ps.mspid,ps.stuscore,b.batchname
+        from ms_class_student cs left join ms_class s on cs.classid=s.classid and cs.examid=s.examid
+        left join t_user u on cs.studentid=u.userid
+        left join ms_paper_student ps on cs.studentid=ps.studentid and cs.subjectid=ps.subjectid
+        and cs.examid=ps.examid
+        left join ms_scanbatch b on ps.batchid=b.batchid and b.mpid=ps.mpid
+        where cs.examid=#{params.examid} and ps.mpid=#{params.mpid}
+        <if test="params.classid!=null and params.classid!=0">
+            and cs.classid=#{params.classid}
+        </if>
+        <if test="params.hasscan!=null and params.hasscan!=0 and params.hasscan==1">
+            and ps.batchid is not null
+        </if>
+        <if test="params.hasscan!=null and params.hasscan!=0 and params.hasscan==2">
+            and ps.batchid is null
+        </if>
+        order by cs.mcsid
+    </select>
+    <!--扫描记录-按批次-->
+    <select id="listRecordBatchStudents" resultType="java.util.Map">
+        select b.batchid,b.batchname,sp.mspid,sp.examno,c.classid,c.classname,u.username studentname
+        from ms_scanbatch_paper sp left join ms_scanbatch b on sp.batchid=b.batchid
+        left join ms_paper_student ps on ps.batchid=b.batchid
+        left join ms_class_student cs on cs.subjectid=ps.subjectid and ps.studentid=cs.studentid
+        left join ms_class c on cs.examid=c.examid and cs.subjectid=c.subjectid and cs.classid=c.classid
+        left join t_user u on ps.studentid=u.userid
+        where b.mpid=#{params.mpid}
+        <if test="params.batchid!=null and params.batchid!=0">
+            and b.batchid=#{params.batchid}
+        </if>
+        <if test="params.hasidentify!=null and params.hasidentify!=0 and params.hasidentify==1">
+            and sp.identified=1
+        </if>
+        <if test="params.hasidentify!=null and params.hasidentify!=0 and params.hasidentify==2">
+            and sp.identified=0
+        </if>
+        order by b.batchid,sp.mspid
+    </select>
+
 </mapper>

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

@@ -1,4 +1,31 @@
 <?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.scan.MsScanbatchPaperBlockMapper">
+    
+    <!--扫描记录-查看原卷-客观题-->
+    <resultMap id="objectiveQuestions" type="java.util.Map">
+        <result property="mspbid" column="mspbid"/>
+        <result property="mpblockid" column="mpblockid"/>
+        <result property="picpath" column="picpath"/>
+        <result property="extendpath" column="extendpath"/>
+        <result property="identifycont" column="identifycont"/>
+        <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="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
+        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
+    </select>
+    <!--扫描记录-查看原卷-主观题-->
+    <select id="listSubjectiveQuestions" resultType="java.util.Map">
+        select b.mspbid,b.mpblockid,b.picpath,b.extendpath,b.identifycont,b.msptype
+        from ms_scanbatch_paper_block b where b.mspid=#{mspid} and b.msptype=2 order by b.mspbid
+    </select>
 </mapper>

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

@@ -5,4 +5,9 @@
     <select id="listPaperByBatchid" resultType="com.xhkjedu.smarking.model.scan.MsScanbatchPaper">
         select * from ms_scanbatch_paper where batchid = #{batchid} order by mspid
     </select>
+
+    <!--查看原卷-试卷信息-->
+    <select id="getScanPaperByMspid" resultType="java.util.Map">
+        select * from ms_scanbatch_paper where mspid = #{mspid}
+    </select>
 </mapper>