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

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectTeacherController.java

@@ -157,6 +157,6 @@ public class EPaperCorrectTeacherController {
         Integer examid = vo.getExamid();
         N_Utils.validation(new Object[]{examid, "考试id", 1});
         Map map = correctTeacherService.markProgress(examid);
-        return new ResultVo(0, "", map);
+        return new ResultVo(0, "获取成功", map);
     }
 }

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

@@ -1,10 +1,14 @@
 package com.xhkjedu.sexam.controller.paperstudent;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.model.paperstudent.EScanbatch;
 import com.xhkjedu.sexam.service.paperstudent.EScanbatchService;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,6 +16,7 @@ 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;
 
 /**
@@ -81,4 +86,25 @@ public class EScanbatchController {
         return new ResultVo(0, "获取成功", map);
     }
 
+    /**
+     * 扫描答题卡详情-学生列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eps]
+     * @Author ywx
+     * @Date 2022/8/15 16:15
+     **/
+    @PostMapping("/list_ss")
+    public ResultVo listScanStu(@RequestBody EPaperStudent eps) {
+        Integer epid = eps.getEpid();
+        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());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
 }

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

@@ -34,4 +34,7 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
 
     //获取答题卡扫描结果
     EScanbatch getScanResult(@Param("epid") Integer epid);
+
+    //扫描答题卡详情-学生列表
+    List<Map> listScanStu(@Param("epid") Integer epid, @Param("sstate") Integer sstate, @Param("username") String username);
 }

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

@@ -119,6 +119,8 @@ public class EScanbatchService {
     //扫描答题卡详情
     public Map getScanDetail(Integer epid, Integer examid) {
         Map map = new HashMap();
+        String examname = eBaseMapper.getNameByExamId(examid);
+        map.put("examname", examname);
         List<Map> classes = eClassMapper.listByExamId(examid);
         int stunum = classes.stream().mapToInt(m -> (int) m.get("classnum")).sum();
         EScanbatch scanbatch = eScanbatchMapper.getScanResult(epid);//获取答题卡扫描结果
@@ -137,4 +139,9 @@ public class EScanbatchService {
         map.put("classes", classes);//班级列表
         return map;
     }
+
+    //扫描答题卡详情-学生列表
+    public List<Map> listScanStu(Integer epid, Integer sstate, String username) {
+        return eScanbatchMapper.listScanStu(epid, sstate, username);
+    }
 }

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

@@ -39,7 +39,7 @@
                          count(case when psq.answered=1 then psq.epsqid else null end),2),0)pyrate
         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
-        left join e_paper_student_question psq on psq.epid=ep.epid and psq.ctype in(3,13,14,15)
+        left join e_paper_student_question psq on psq.epid=ep.epid
         where es.examid=#{examid}
         group by es.esid
     </select>

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

@@ -29,7 +29,7 @@
     <!--扫描答题卡列表-->
     <select id="listScanSubject" 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
+             ,ifnull(truncate(count(case when epsq.checked=2 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
@@ -37,7 +37,7 @@
              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)
+             group by es.esid)a left join e_paper_qtype_question epqq on a.epid = epqq.epid
                                 left join e_paper_student_question epsq on epsq.eptqid = epqq.eptqid and epsq.answered=1
         group by a.epid
     </select>
@@ -52,5 +52,21 @@
         select sum(batchnum)batchnum,sum(scannum)scannum,su(errornum)errornum,sum(es.qknum)qknum,examid
         from e_scanbatch where epid=#{epid}
     </select>
-
+    <!--扫描答题卡详情-学生列表-->
+    <select id="listScanStu" resultType="java.util.Map">
+        select eps.epsid,u.username,u.examno,ec.classname,eps.batchid,eps.sstate,eps.stupic
+        from e_paper_student eps left join e_class ec on eps.examid = ec.examid and eps.classid = ec.classid
+        left join t_user u on eps.studentid = u.userid
+        <where>
+            <if test="sstate==1">
+                and eps.batchid is null
+            </if>
+            <if test="sstate==2">
+                and eps.batchid is not null
+            </if>
+            <if test="username!=null and username!=''">
+                and (u.username like '%${username}%' or u.examno like '%${username}%')
+            </if>
+        </where>
+    </select>
 </mapper>