Merge remote-tracking branch 'cloud-schoolapi/ywx'

# Conflicts:
#	sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EScanbatchController.java
#	sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EScanbatchMapper.java
#	sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EScanbatchService.java
#	sexam/src/main/resources/mapper/paperstudent/EScanbatchMapper.xml

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

@@ -12,7 +12,6 @@ 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;
 
 /**
@@ -51,6 +50,23 @@ public class EScanbatchController {
         return new ResultVo(0, "获取成功", map);
     }
 
+    /**
+     * 扫描答题卡详情
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eps]
+     * @Author ywx
+     * @Date 2022/8/11 15:47
+     **/
+    @PostMapping("/detail")
+    public ResultVo getScanDetail(@RequestBody EPaperStudent eps) {
+        Integer epid = eps.getEpid();
+        Integer examid = eps.getExamid();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1, examid, "考试id", 1});
+        Map map = eScanbatchService.getScanDetail(epid, examid);
+        return new ResultVo(0, "获取详情成功", map);
+    }
+
     /**
      * @description: 试卷扫描答题卡
      * @param: [eScanbatch]
@@ -65,4 +81,5 @@ public class EScanbatchController {
         Map map = eScanbatchService.scanPaperDetail(epid);
         return new ResultVo(0, "获取成功", map);
     }
+
 }

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

@@ -31,4 +31,7 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
 
     //试卷扫描批次信息
     List<Map> listScanBatchPapers(@Param("epid")Integer epid);
+
+    //获取答题卡扫描结果
+    EScanbatch getScanResult(@Param("epid") Integer epid);
 }

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

@@ -2,11 +2,12 @@ package com.xhkjedu.sexam.service.paperstudent;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
+import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EScanbatchMapper;
 import com.xhkjedu.sexam.model.paperstudent.EScanbatch;
+import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.utils.N_Utils;
-import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,6 +29,9 @@ public class EScanbatchService {
     @Resource
     private EBaseMapper eBaseMapper;
 
+    @Resource
+    private EClassMapper eClassMapper;
+
     /**
      * @description: 保持扫描试卷批次信息
      * @param: [eScanbatch]
@@ -100,4 +104,26 @@ public class EScanbatchService {
         rtnmap.put("scans",batchlist);
         return rtnmap;
     }
+
+    //扫描答题卡详情
+    public Map getScanDetail(Integer epid, Integer examid) {
+        Map map = new HashMap();
+        List<Map> classes = eClassMapper.listByExamId(examid);
+        int stunum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
+        EScanbatch scanbatch = eScanbatchMapper.getScanResult(epid);//获取答题卡扫描结果
+        Integer batchnum = scanbatch.getBatchnum();
+        Integer scannum = scanbatch.getScannum();
+        Integer errornum = scanbatch.getErrornum();
+        Integer qknum = scanbatch.getQknum();
+        Integer wsnum = ExamUtil.subtractInt(stunum, batchnum);
+        map.put("jhnum", stunum);//计划张数
+        map.put("wsnum", wsnum);//未扫张数
+        map.put("ysnum", batchnum);//已扫张数
+        map.put("qknum", qknum);//缺考人数
+        map.put("smrate", N_Utils.getIntegerDivideAndMulitiply(wsnum, stunum));//扫描进度
+        map.put("sbnum", scannum);//识别张数
+        map.put("sbrate", N_Utils.getIntegerDivideAndMulitiply(scannum - errornum, scannum));//识别比例
+        map.put("classes", classes);//班级列表
+        return map;
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -122,8 +122,17 @@ public class ExamUtil {
 
     }
 
+    //两数相减
+    public static Integer subtractInt(Integer a, Integer b) {
+        BigInteger biginta = new BigInteger(a + "");
+        BigInteger bigintb = new BigInteger(b + "");
+        return biginta.subtract(bigintb).intValue();
+
+    }
+
     /**
      * 分数百分比
+     *
      * @param v1 分数
      * @param v2 占比如80%写作0.8
      * @return

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

@@ -48,4 +48,10 @@
         select * from e_scanbatch where epid=#{epid} order by createtime desc
     </select>
 
+    <!--获取答题卡扫描结果-->
+    <select id="getScanResult" resultType="com.xhkjedu.sexam.model.paperstudent.EScanbatch">
+        select sum(batchnum)batchnum,sum(scannum)scannum,su(errornum)errornum,sum(es.qknum)qknum,examid
+        from e_scanbatch where epid=#{epid}
+    </select>
+
 </mapper>