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

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

@@ -47,4 +47,7 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
 
     //扫描对应学校id
     Map getScanBatchSchool(@Param("batchid") Integer batchid);
+
+    //扫描答题卡详情
+    Map getScanDetail(@Param("epid") Integer epid);
 }

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

@@ -136,24 +136,14 @@ public class EScanbatchService {
 
     //扫描答题卡详情
     public Map getScanDetail(Integer epid, Integer examid) {
-        Map map = eScanbatchMapper.listByEpId(epid);
+        Map map = eScanbatchMapper.getScanDetail(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 scannum = scanbatch.getScannum();
-        Integer errornum = scanbatch.getErrornum();
-        Integer sbnum = scannum - errornum;
-        Integer qknum = scanbatch.getQknum();
-        Integer wsnum = ExamUtil.subtractInt(jhnum, scannum);
-        map.put("jhnum", jhnum);//计划张数
-        map.put("wsnum", wsnum);//未扫张数
-        map.put("ysnum", scannum);//已扫张数
-        map.put("qknum", qknum);//缺考人数
-        map.put("smrate", N_Utils.getIntegerDivideAndMulitiply(scannum, jhnum));//扫描进度
-        map.put("sbnum", sbnum);//识别张数
-        map.put("sbrate", N_Utils.getIntegerDivideAndMulitiply(sbnum, scannum));//识别比例
+        int jhnum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
+        Integer ysnum = (Integer) map.get("ysnum");//已扫人数
+        Integer wsnum = ExamUtil.subtractInt(jhnum, ysnum);
+        map.put("jhnum", jhnum);//计划人数
+        map.put("wsnum", wsnum);//未扫人数
+        map.put("smrate", N_Utils.getIntegerDivideAndMulitiply(ysnum, jhnum));//扫描进度
         map.put("classes", classes);//班级列表
         return map;
     }

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

@@ -95,4 +95,13 @@
         from e_scanbatch b left join e_base e on b.examid=e.examid
             left join t_school s on e.schoolid=s.schoolid  where b.batchid=#{batchid}
     </select>
+    <!--扫描答题卡详情-->
+    <select id="getScanDetail" resultType="java.util.Map">
+        select eb.examname,eb.examid,eb.gradeid,es.subjectname
+        ,count(distinct case when eps.sstate=3 then eps.epsid else null end)qknum
+        ,count(distinct case when eps.sstate!=0 then eps.epsid else null end)ysnum
+        from e_paper_student eps left join e_base eb on eps.examid = eb.examid
+        left join e_subject es on eps.esid = es.esid
+        where eps.epid=#{epid}
+    </select>
 </mapper>