优化阅卷进度接口

教师、学生课堂回顾

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -551,4 +551,19 @@ public class ClassroomController {
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0, "获取考试按人统计列表成功", pageResult);
     }
+
+    /*
+     * @Description 投票详情
+     * @Date 2024/6/11 14:33:12
+     * @Author WN
+     * @Param [vote]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail_vote")
+    public ResultVo detailVote(@RequestBody TClassroomVote vote) {
+        Integer voteid = vote.getVoteid();
+        N_Utils.validation(new Object[]{voteid, "投票id", 1});
+        List<Map<String,Object>> votes = classroomService.getVoteDetail(voteid);
+        return new ResultVo(0, "获取投票详情成功", votes);
+    }
 }

sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomVoteMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sclass.mapper.classroom;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sclass.model.classroom.TClassroomVote;
+import com.xhkjedu.sclass.model.classroom.TClassroomVoteStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,4 +12,10 @@ public interface ClassroomVoteMapper extends TkMapper<TClassroomVote> {
 
     //获取课堂投票
     List<Map<String,Object>> listVoteByRoomid(@Param("roomid")Long roomid);
+
+    //投票参与学生
+    List<TClassroomVoteStudent> listVoteStus(@Param("voteid")Integer voteid);
+
+    //课堂信息投票
+    List<Map> listVoteStuByRoomAndStuid(@Param("roomid")Long roomid,@Param("studentid")Integer studentid);
 }

sclass/src/main/java/com/xhkjedu/sclass/model/classroom/TClassroomVoteStudent.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 @Table(name = "t_classroom_vote_student")
 @Data
@@ -32,11 +33,14 @@ public class TClassroomVoteStudent {
     /**
      * 学生投票结果
      */
-    private Integer stuvote;
+    private String stuvote;
 
     /**
      * 创建时间
      */
     private Integer createtime;
 
+    @Transient
+    private String username;
+
 }

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -390,6 +390,7 @@ public class ClassroomService {
     }
 
 
+    //学生课堂回顾
     public ResultVo getReportStu(Long roomid, Integer studentid) {
         Map room = classroomMapper.getReportStu(roomid, studentid);
         Integer signnum = classroomMapper.getRoomStudentSigin(roomid, studentid);
@@ -400,12 +401,12 @@ public class ClassroomService {
         if (room == null) room = new HashMap();
         room.put("signstate", signstate);
         room.put("videos", classroomVideoMapper.listByRoomId(roomid));
+        room.put("votes",classroomVoteMapper.listVoteStuByRoomAndStuid(roomid,studentid));
         return new ResultVo(0, "获取学生课堂回顾详情成功", room);
     }
 
     /**
      * 获取教师指定章节下上过的课堂历史
-     *
      * @return java.util.List<com.xhkjedu.sclass.vo.classroom.RoomVo>
      * @Param [room]
      * @Author ywx
@@ -891,4 +892,36 @@ public class ClassroomService {
     public void deleteById(Long roomid) {
         classroomMapper.deleteByPrimaryKey(roomid);
     }
+
+    /*
+     * @Description 投票详情
+     * @Date 2024/6/11 14:31:33
+     * @Author WN
+     * @Param [voteid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String,Object>> getVoteDetail(Integer voteid){
+        List<Map<String,Object>> list = new ArrayList<>();
+
+        List<TClassroomVoteStudent> stuList = classroomVoteMapper.listVoteStus(voteid);
+
+        //获取所有内容
+        List<String> voteContList = stuList.stream().map(v -> v.getStuvote().trim()).collect(Collectors.toList());
+        voteContList = voteContList.stream().distinct().collect(Collectors.toList());
+        int total = stuList.size();
+        for(String str : voteContList){
+            Map<String,Object> map = new HashMap<>();
+            map.put("stuvote",str);
+
+            List<TClassroomVoteStudent> voteList = stuList.stream().filter(v -> str.equals(v.getStuvote().trim())).collect(Collectors.toList());
+            int votenum = voteList.size();
+            Double rate = N_Utils.getIntegerDivideAndMulitiply(votenum, total);
+            map.put("votenum",votenum);
+            map.put("rate",rate);
+            List<String> stuNames = voteList.stream().map(TClassroomVoteStudent::getUsername).collect(Collectors.toList());
+            map.put("stus",stuNames);
+            list.add(map);
+        }
+        return list;
+    }
 }

sclass/src/main/resources/mapper/classroom/ClassroomVoteMapper.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sclass.mapper.classroom.ClassroomVoteMapper">
-  <resultMap id="BaseResultMap" type="com.xhkjedu.sclass.model.classroom.TClassroomVote">
-    <id column="voteid" jdbcType="INTEGER" property="voteid" />
-    <result column="roomid" jdbcType="BIGINT" property="roomid" />
-    <result column="votetitle" jdbcType="VARCHAR" property="votetitle" />
-    <result column="duration" jdbcType="INTEGER" property="duration" />
-    <result column="selectnum" jdbcType="INTEGER" property="selectnum" />
-    <result column="voatetype" jdbcType="VARCHAR" property="voatetype" />
-    <result column="createid" jdbcType="INTEGER" property="createid" />
-    <result column="createtime" jdbcType="INTEGER" property="createtime" />
-    <result column="schoolid" jdbcType="INTEGER" property="schoolid" />
-    <result column="options" jdbcType="LONGVARCHAR" property="options" />
-  </resultMap>
 
   <!--获取课堂投票-->
   <select id="listVoteByRoomid" resultType="java.util.Map">
     select voteid,votetitle,duration,votetype from t_classroom_vote where roomid=#{roomid} order by createtime desc
   </select>
+
+  <!--投票参与学生-->
+  <select id="listVoteStus" resultMap="com.xhkjedu.sclass.model.classroom.TClassroomVoteStudent">
+    select s.stuvote,s.createtime,s.studentid,u.username from t_classroom_vote_student s
+    left join t_user u on s.studentid=u.userid
+    where s.voteid=#{voteid} order by s.createtime
+  </select>
+
+  <!--课堂信息投票-->
+  <select id="listVoteStuByRoomAndStuid" resultMap="java.util.Map">
+    select v.voteid,v.votetitle,v.duration,v.options,
+    v.selectnum,v.votetype,vs.stuvote,vs.createtime from t_classroom_vote v
+    left join t_classroom_vote_student vs on vs.voteid=v.voteid
+    where v.roomid=#{roomid} and vs.studentid=#{studentid}
+  </select>
 </mapper>

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

@@ -36,8 +36,8 @@ public interface EScanbatchMapper extends TkMapper<EScanbatch> {
     //扫描答题卡列表-科目
     List<ScanSubjectVo> listScanExamSubject(@Param("examid") Integer examid);
 
-    //扫描答题卡列表-科目扫描信息
-    List<ScanSubjectVo> listScanExamSubjectRate(@Param("list")List<ScanSubjectVo> subjectList,@Param("examid") Integer examid);
+    //扫描答题卡列表-扫描未处理数量
+    List<ScanSubjectVo> listScanExamSubjectWcl(@Param("examid") Integer examid);
 
     //试卷扫描批次信息
     List<Map> listScanBatchPapers(@Param("epid") Integer epid);

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

@@ -90,19 +90,13 @@ public class EScanbatchService {
         Map map = eBaseMapper.findById(examid);
         List<ScanSubjectVo> subjectList = eScanbatchMapper.listScanExamSubject(examid);
 
-        List<ScanSubjectVo> scanList = eScanbatchMapper.listScanExamSubjectRate(subjectList,examid);
-        for(ScanSubjectVo subjectVo : subjectList){
-            ScanSubjectVo scanRate = scanList.stream().filter(s -> s.getEpid().equals(subjectVo.getEpid())).findFirst().orElse(null);
-            if(scanRate!=null){
-                Double smrate = N_Utils.getIntegerDivideAndMulitiply(scanRate.getSmnum(),subjectVo.getExamnum());
-                subjectVo.setSmrate(smrate);
-                subjectVo.setWclnum(scanRate.getWclnum());
-
-                Integer yjnum = scanRate.getYjnum();
-                Integer allnum = scanRate.getAllnum();
+        //扫描答题卡为处理数量
+        List<ScanSubjectVo> wclList = eScanbatchMapper.listScanExamSubjectWcl(examid);
 
-                Double yjrate = N_Utils.getIntegerDivideAndMulitiply(yjnum,allnum);
-                subjectVo.setYjrate(yjrate);
+        for(ScanSubjectVo subjectVo : subjectList){
+            ScanSubjectVo wclScan = wclList.stream().filter(s -> s.getEpid().equals(subjectVo.getEpid())).findFirst().orElse(null);
+            if(wclScan!=null){
+                subjectVo.setWclnum(wclScan.getWclnum());
             }
         }
         map.put("subjects", subjectList);

sexam/src/main/java/com/xhkjedu/sexam/vo/paperscan/ScanSubjectVo.java

@@ -18,21 +18,21 @@ public class ScanSubjectVo {
 
     private Integer epid;//试卷id
 
-    private Integer examnum;//计划人数
+    private Integer examnum = 0;//计划人数
 
-    private Integer smnum;//扫描人数
+    private Integer smnum = 0;//扫描人数
 
-    private Integer qknum;//缺考人数
+    private Integer qknum = 0;//缺考人数
 
 
     private Double smrate;//扫描人数
 
-    private Integer wclnum;//未处理异常记录数量
+    private Integer wclnum = 0;//未处理异常记录数量
 
     private Double yjrate;//阅卷进度
 
-    private Integer yjnum;//已批阅数量
+    private Integer yjnum = 0;//已批阅数量
 
-    private Integer allnum;//总数量
+    private Integer allnum = 0;//总数量
 
 }

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

@@ -52,32 +52,27 @@
 
     <!--扫描答题卡列表-科目-->
     <select id="listScanExamSubject" resultType="com.xhkjedu.sexam.vo.paperscan.ScanSubjectVo">
-        select es.esid,es.esstate,es.subjectname,count(eps.epid)examnum,ep.epid
+        select a.*,ifnull(truncate(a.smnum*100/a.examnum,2),0)smrate
+        ,ifnull(truncate(count(distinct case when epsq.checked=2 then epsq.epsqid else null end)*100/count(distinct 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
+        where es.examid=#{examid}
+        group by es.esid)a
+                left join e_paper_student_question epsq on a.epid = epsq.epid and epsq.answered=1
+        group by a.epid
     </select>
 
-    <!--扫描答题卡列表-科目扫描信息-->
-    <select id="listScanExamSubjectRate" resultType="com.xhkjedu.sexam.vo.paperscan.ScanSubjectVo">
-        select epqq.epid, count(distinct er.serrorid)wclnum,
-        count(distinct case when epsq.checked=2 then epsq.epsqid else null end) yjnum,
-        count(distinct epsq.epsqid) allnum
-        from e_paper_qtype_question epqq
-        left join e_paper_student_question epsq on epsq.eptqid = epqq.eptqid and epsq.answered=1
-        left join e_scanbatch b on b.epid=epqq.epid
-        left join e_scanerror er on b.batchid=er.batchid and er.errorstate=0
-        where epsq.examid=#{examid} and
-        epqq.epid in
-        <foreach collection="list" item="obj" open="(" close=")" separator=",">
-            #{obj.epid}
-        </foreach>
-        group by epqq.epid
-    </select>
+    <!--扫描答题卡列表-扫描未处理数量-->
+    <select id="listScanExamSubjectWcl" resultType="com.xhkjedu.sexam.vo.paperscan.ScanSubjectVo">
+        select b.epid,count(distinct case when er.errorstate=0 then er.serrorid else null end)wclnum from e_scanerror er
+        left join e_scanbatch b on b.batchid=er.batchid
+        where b.examid= #{examid}
+        group by b.epid
+</select>
 
     <!--试卷扫描批次信息-->
     <select id="listScanBatchPapers" resultType="java.util.Map">