Merge remote-tracking branch 'origin/ywx' into wn_j

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/ESubjectInvigilateController.java

@@ -180,4 +180,20 @@ public class ESubjectInvigilateController {
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0, "获取成功", pageResult);
     }
+
+    /**
+     * 扫描答题卡列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [subject]
+     * @Author ywx
+     * @Date 2022/8/11 11:28
+     **/
+    @PostMapping("/list_sm")
+    public ResultVo listScan(@RequestBody ESubject subject) {
+        Integer examid = subject.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        Map map = eSubjectInvigilateService.listScan(examid);
+        return new ResultVo(0, "获取成功", map);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectInvigilateMapper.java

@@ -18,5 +18,9 @@ public interface ESubjectInvigilateMapper extends TkMapper<ESubjectInvigilate> {
     List<Map> listByEsId(@Param("esid") Integer esid);
 
     //教师监考-监控列表
-    List<Map> listJkSubject(@Param("examid") Integer examid, @Param("teacherid") Integer teacherid, @Param("esstate") Integer esstate);
+    List<Map> listJkSubject(@Param("examid") Integer examid, @Param("teacherid") Integer teacherid,
+                            @Param("esstate") Integer esstate);
+
+    //扫描答题卡列表
+    List<Map> listSSubject(@Param("examid") Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/service/exam/ESubjectInvigilateService.java

@@ -73,4 +73,12 @@ public class ESubjectInvigilateService {
     public Map getESubjectByEsId(Integer esid) {
         return eSubjectMapper.getESubjectByEsId(esid);
     }
+
+    //扫描答题卡列表
+    public Map listScan(Integer examid) {
+        Map map = eBaseMapper.findById(examid);
+        List<Map> subjects = eSubjectInvigilateMapper.listSSubject(examid);//扫描答题卡列表
+        map.put("subjects", subjects);
+        return map;
+    }
 }

sexam/src/main/resources/mapper/exam/ESubjectInvigilateMapper.xml

@@ -55,4 +55,19 @@
             order by es.sdate desc,es.endtime desc
         </if>
     </select>
+    <!--扫描答题卡列表-->
+    <select id="listSSubject" resultType="java.util.Map">
+        select a.*,ifnull(truncate(a.smnum*100/a.examnum,2),0)smrate
+        ,ifnull(truncate(count(case when epsq.checked=1 then epsq.epsqid else null end)*100/count(epsq.epsqid),2),0)yjrate
+        from(select es.esid,es.esstate,es.subjectname
+        ,count(eps.epid)examnum,ep.epid
+        ,count(case when eps.sstate!=0 then eps.epsid else null end)smnum
+        ,count(case when eps.sstate=3 then eps.epsid else null end)qknum
+        from e_subject es left join e_paper ep on es.esid = ep.esid
+        left join e_paper_student eps on ep.epid = eps.epid
+        where es.examid=#{examid}
+        group by es.esid)a left join e_paper_qtype_question epqq on a.epid = epqq.epid and epqq.ctype in(3,13,14,15)
+        left join e_paper_student_question epsq on epsq.eptqid = epqq.eptqid and epsq.answered=1
+        group by a.epid
+    </select>
 </mapper>

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

@@ -12,7 +12,7 @@
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
-        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
         ,0 classids
@@ -35,7 +35,7 @@
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
-        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,13,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct concat(pq.qn,'_',pq.eptqid) order by pq.eptqid)qns
         ,0 classids