扫描答题卡详情

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EScanbatchController.java

@@ -100,11 +100,15 @@ public class EScanbatchController {
         Integer sstate = eps.getSstate();
         Integer page = eps.getPage();
         Integer pageSize = eps.getPageSize();
-        N_Utils.validation(new Object[]{epid, "试卷id", 1, sstate, "扫描状态", 1
-                , page, "页码", 1, pageSize, "显示条数", 1});
-        PageHelper.startPage(page, pageSize);
-        List<Map> list = eScanbatchService.listScanStu(epid, sstate, eps.getCreatename(), eps.getClassid());
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "获取成功", pageResult);
+        N_Utils.validation(new Object[]{epid, "试卷id", 1, sstate, "扫描状态", 1});
+        if (N_Utils.isEmptyInteger(page)) {
+            List<Map> list = eScanbatchService.listScanStu(epid, sstate, eps.getCreatename(), eps.getClassid());
+            return new ResultVo(0, "获取成功", list);
+        } else {
+            PageHelper.startPage(page, pageSize);
+            List<Map> list = eScanbatchService.listScanStu(epid, sstate, eps.getCreatename(), eps.getClassid());
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取成功", pageResult);
+        }
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EScanbatchMapper.java

@@ -30,7 +30,7 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
     List<Map> listScanSubject(@org.apache.ibatis.annotations.Param("examid") Integer examid);
 
     //试卷扫描批次信息
-    List<Map> listScanBatchPapers(@Param("epid")Integer epid);
+    List<Map> listScanBatchPapers(@Param("epid") Integer epid);
 
     //获取答题卡扫描结果
     EScanbatch getScanResult(@Param("epid") Integer epid);
@@ -38,4 +38,7 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
     //扫描答题卡详情-学生列表
     List<Map> listScanStu(@Param("epid") Integer epid, @Param("sstate") Integer sstate, @Param("username") String username,
                           @Param("classid") Integer classid);
+
+    //试卷基础信息
+    Map listByEpId(@Param("epid") Integer epid);
 }

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

@@ -83,27 +83,22 @@ public class EScanbatchService {
      **/
     public Map scanPaperDetail(Integer epid) {
         Map paper = ePaperMapper.getExamPaperSubjectForScan(epid);
-        int ysznum = 0;
         Integer ysrnum = Integer.parseInt(paper.get("ysrnum").toString());
-        if(paper.get("scantronfile")!=null){
-            String scantronfile = paper.get("scantronfile").toString();
-            List<String> sflist = JSON.parseArray(scantronfile,String.class);
-            int pn = sflist.size() / 2;//答题卡的张数
-            ysznum = ysrnum * pn;//应扫码张数
-        }
-        paper.put("ysznum",ysznum);
-        paper.remove("scantronfile");
+        Integer scantronnum = Integer.parseInt(paper.get("scantronnum").toString());
+        int ysznum = ysrnum * scantronnum;//应扫码张数
+        paper.put("ysznum", ysznum);
+        paper.remove("scantronnum");
 
         String alljson = paper.get("alljson").toString();
-        Map pamap = JSON.parseObject(alljson,Map.class);
+        Map pamap = JSON.parseObject(alljson, Map.class);
         List<Map> ranglist = (List<Map>) pamap.get("ranglist");
-        for(Map m : ranglist){
+        for (Map m : ranglist) {
             String ptname = m.get("qtname").toString();
-            Integer num = Integer.parseInt( m.get("num").toString());
-            if("客观题".equals(ptname)){
-                paper.put("kgt",num);
-            }else{
-                paper.put("zgt",num);
+            Integer num = Integer.parseInt(m.get("num").toString());
+            if ("客观题".equals(ptname)) {
+                paper.put("kgt", num);
+            } else {
+                paper.put("zgt", num);
             }
         }
         paper.remove("alljson");
@@ -118,21 +113,22 @@ public class EScanbatchService {
 
     //扫描答题卡详情
     public Map getScanDetail(Integer epid, Integer examid) {
-        Map map = eBaseMapper.findById(examid);
+        Map map = eScanbatchMapper.listByEpId(epid);
         List<Map> classes = eClassMapper.listByExamId(examid);
         int stunum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
+        Integer scantronnum = N_Utils.str2Int(map.get("scantronnum").toString());
+        Integer jhnum = stunum * scantronnum;
         EScanbatch scanbatch = eScanbatchMapper.getScanResult(epid);//获取答题卡扫描结果
-        Integer batchnum = scanbatch.getBatchnum();
         Integer scannum = scanbatch.getScannum();
         Integer errornum = scanbatch.getErrornum();
         Integer sbnum = scannum - errornum;
         Integer qknum = scanbatch.getQknum();
-        Integer wsnum = ExamUtil.subtractInt(stunum, batchnum);
-        map.put("jhnum", stunum);//计划张数
+        Integer wsnum = ExamUtil.subtractInt(jhnum, scannum);
+        map.put("jhnum", jhnum);//计划张数
         map.put("wsnum", wsnum);//未扫张数
-        map.put("ysnum", batchnum);//已扫张数
+        map.put("ysnum", scannum);//已扫张数
         map.put("qknum", qknum);//缺考人数
-        map.put("smrate", N_Utils.getIntegerDivideAndMulitiply(scannum, stunum));//扫描进度
+        map.put("smrate", N_Utils.getIntegerDivideAndMulitiply(scannum, jhnum));//扫描进度
         map.put("sbnum", sbnum);//识别张数
         map.put("sbrate", N_Utils.getIntegerDivideAndMulitiply(sbnum, scannum));//识别比例
         map.put("classes", classes);//班级列表

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -127,7 +127,7 @@
 
     <!--根据试卷id获取考试科目信息-->
     <select id="getExamPaperSubjectForScan" resultType="java.util.Map">
-        select e.examname,e.gradeid,s.subjectname,p.pnum,p.ptype,a.alljson,p.scantronfile,
+        select e.examname,e.gradeid,s.subjectname,p.pnum,p.ptype,a.alljson,ifnull(p.scantronnum,1)scantronnum,
                (select count(*) from e_paper_student ps where ps.epid=p.epid) ysrnum
         from e_paper p left join e_subject s on p.esid=s.esid
         left join e_base e on s.examid=e.examid left join e_paper_analyze a on p.epid=a.epid

sexam/src/main/resources/mapper/paperstudent/EScanbatchMapper.xml

@@ -49,7 +49,8 @@
 
     <!--获取答题卡扫描结果-->
     <select id="getScanResult" resultType="com.xhkjedu.sexam.model.paperstudent.EScanbatch">
-        select sum(batchnum)batchnum,sum(scannum)scannum,sum(errornum)errornum,sum(qknum)qknum,examid
+        select ifnull(sum(batchnum),0)batchnum,ifnull(sum(scannum),0)scannum
+        ,ifnull(sum(errornum),0)errornum,ifnull(sum(qknum),0)qknum
         from e_scanbatch where epid=#{epid}
     </select>
     <!--扫描答题卡详情-学生列表-->
@@ -72,4 +73,10 @@
             </if>
         </where>
     </select>
+    <!--试卷基础信息-->
+    <select id="listByEpId" resultType="java.util.Map">
+        select ifnull(ep.scantronnum,1)scantronnum,eb.examname,eb.gradeid
+        from e_paper ep left join e_base eb on ep.examid = eb.examid
+        where ep.epid=#{epid}
+    </select>
 </mapper>