实时监控详情，学生考试报告班级、年级平均分去除.0

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

@@ -160,7 +160,7 @@ public class ESubjectBadstudentController {
         Integer esid = invigilate.getEsid();
         N_Utils.validation(new Object[]{teacherid, "教师id", 1, esid, "考试科目id", 1});
         Map map = eSubjectBadstudentService.getJkClass(invigilate);
-        return new ResultVo(0, "获取成功", map.get("classes"));
+        return new ResultVo(0, "获取成功", map);
     }
 
     /**
@@ -210,4 +210,36 @@ public class ESubjectBadstudentController {
         Map map = eSubjectBadstudentService.getPaperRate(invigilate);
         return new ResultVo(0, "获取成功", map);
     }
+
+    /*
+     * 监控学生
+     * @Param [invigilate]
+     * @Author ywx
+     * @Date 2022/11/7 9:18
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/jk_xs2")
+    public ResultVo listJkStu2(@RequestBody ESubjectInvigilate invigilate) {
+        Integer esid = invigilate.getEsid();
+        Integer classid = invigilate.getClassid();
+        N_Utils.validation(new Object[]{esid, "考试科目id", 1, classid, "班级id", 1});
+        List<Map> list = eSubjectBadstudentService.listStu2(invigilate);
+        return new ResultVo(0, "获取成功", list);
+    }
+
+    /*
+     * 监控概况
+     * @Param [invigilate]
+     * @Author ywx
+     * @Date 2022/11/7 9:33
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_jkgk")
+    public ResultVo getJkGk(@RequestBody ESubjectInvigilate invigilate) {
+        Integer esid = invigilate.getEsid();
+        Integer classid = invigilate.getClassid();
+        N_Utils.validation(new Object[]{esid, "考试科目id", 1, classid, "班级id", 1});
+        Map map = eSubjectBadstudentService.getJkGk(invigilate);
+        return new ResultVo(0, "获取成功", map);
+    }
 }

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

@@ -23,4 +23,7 @@ public interface ESubjectBadstudentMapper extends TkMapper<ESubjectBadstudent> {
 
     //学生违纪行为分析详情
     List<Map> listBad(@Param("studentid") Integer studentid, @Param("examid") Integer examid);
+
+    //监考学生
+    List<Map> listStu2(@Param("ei") ESubjectInvigilate ei);
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.sexam.service.exam;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectBadstudentMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.exam.ESubjectBadstudent;
 import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
 import com.xhkjedu.utils.N_Utils;
@@ -12,6 +13,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ESubjectBadstudentService {
@@ -21,6 +23,8 @@ public class ESubjectBadstudentService {
     private ESubjectMapper eSubjectMapper;
     @Resource
     private EClassMapper eClassMapper;
+    @Resource
+    private UserMapper userMapper;
 
     //添加
     public void save(ESubjectBadstudent model) {
@@ -52,9 +56,13 @@ public class ESubjectBadstudentService {
         Map map = eSubjectMapper.getESubjectByEsId(esid);//考试科目基本信息
         String classids = "";
         List<Map> classes = eClassMapper.listByExamId((Integer) map.get("examid"));//考试班级
-        if (teacherid != 0) {
+        Integer createid= (Integer) map.get("createid");
+        if (!N_Utils.isEmptyInteger(teacherid) && !createid.equals(teacherid)
+                && userMapper.getUsertypeByUserid(teacherid) == 1) {
             Map claMap = eSubjectBadstudentMapper.getClass(esid, teacherid);//教师监考班级
-            if (claMap.get("majored").equals(0)) {//教师不是主监考
+            if (claMap == null) {
+                classes = new ArrayList<>();
+            } else if (claMap.get("majored").equals(0)) {//教师不是主监考
                 List<Map> classes2 = new ArrayList<>();
                 classids = claMap.get("classids").toString();
                 String[] classIds = classids.split(",");
@@ -64,6 +72,8 @@ public class ESubjectBadstudentService {
                 }
                 classes = classes2;
             }
+        } else {
+            classids = classes.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
         }
         map.put("classids", classids);
         map.put("classes", classes);
@@ -91,4 +101,14 @@ public class ESubjectBadstudentService {
     public Map getPaperRate(ESubjectInvigilate ei) {
         return eSubjectBadstudentMapper.getPaperRate(ei);
     }
+
+    //监考学生
+    public List<Map> listStu2(ESubjectInvigilate ei) {
+        return eSubjectBadstudentMapper.listStu2(ei);
+    }
+
+    //监控详情
+    public Map getJkGk(ESubjectInvigilate ei) {
+        return eSubjectBadstudentMapper.getPaperRate(ei);//学生进场概况
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -294,8 +294,8 @@ public class EReportStudentService {
                         mq.put("points", points);
                     }
                     mq.put("complexity",q.get("mcomplexity").toString());
-                    mq.put("classavgscore",q.get("classavgscore").toString());
-                    mq.put("gradeavgscore",q.get("gradeavgscore").toString());
+                    mq.put("classavgscore",ExamUtil.removeStrEnd0(q.get("classavgscore").toString()));
+                    mq.put("gradeavgscore",ExamUtil.removeStrEnd0(q.get("gradeavgscore").toString()));
 
                     Double stuscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("stuscore").toString())).sum();
                     Double pscore = sonqueslist.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();

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

@@ -402,6 +402,21 @@ public class ExamUtil {
         return date.getTime()/1000;
     }
 
+    /*
+     * 去除字符串末尾的.0
+     * @Param [str]
+     * @Author ywx
+     * @Date 2022/11/7 10:46
+     * @return java.lang.String
+     **/
+    public static String removeStrEnd0(String str){
+        if(N_Utils.isEmpty(str)) return str;
+        if(str.endsWith(".0")){
+            str=str.substring(0,str.lastIndexOf("."));
+        }
+        return str;
+    }
+
     public static void main(String[] args) {
 
     }

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

@@ -19,6 +19,7 @@
         <if test="ei.createname!=null and ei.createname!=''">
             and u.username like '%${ei.createname}%'
         </if>
+        order by convert(u.username using gbk),u.userid
     </select>
     <!--学生进场概况-->
     <select id="getPaperRate" resultType="java.util.Map">
@@ -54,4 +55,17 @@
         </if>
         order by es.esbsid desc
     </select>
+    <!--监考学生-->
+    <select id="listStu2" resultType="java.util.Map">
+        select es.classid,es.sstate,u.username,es.studentid
+        from e_paper_student es left join t_user u on es.studentid = u.userid
+        where es.esid=#{ei.esid} and es.classid=#{ei.classid}
+        <if test="ei.sstate!=null">
+            and es.sstate=#{ei.sstate}
+        </if>
+        <if test="ei.createname!=null and ei.createname!=''">
+            and u.username like '%${ei.createname}%'
+        </if>
+        order by convert(u.username using gbk),u.userid
+    </select>
 </mapper>

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

@@ -54,7 +54,7 @@
     <!--根据考试科目id获取考试科目基本信息-->
     <select id="getESubjectByEsId" resultType="java.util.Map">
         select es.sdate,es.begintime,es.endtime,es.subjectname
-        ,eb.examname,eb.schoolid,eb.examid,eb.gradeid,eb.examtype
+        ,eb.examname,eb.schoolid,eb.examid,eb.gradeid,eb.examtype,eb.createid
         from e_subject es left join e_base eb on es.examid = eb.examid
         where es.esid=#{esid}
     </select>

sexam/src/main/resources/mapper/report/ERstudentMapper.xml

@@ -11,10 +11,17 @@
     <select id="listSubject" resultType="java.util.Map">
         select s.score,s.classrank,s.classrankpre,s.classmaxscore,s.classavgscore
         ,s.schoolrank,s.schoolmaxscore,s.schoolavgscore,s.goal,s.nextgoal,s.subjectname,s.subjectid,s.bzscore
-        from e_rstudent s where s.examid=#{examid} and s.studentid=#{studentid}
+        ,eps.device,eps.submittype,eps.endtime
+        ,(case when s.subjectid='zf' then (select (
+        case when count(eps2.epsid)=count(case when eps2.sstate=3 then eps2.epsid else null end) then 3 else 2 end)
+        from e_paper_student eps2 where eps2.examid=s.examid and eps2.studentid=s.studentid)
+        else eps.sstate end)sstate
+        from e_rstudent s left join e_paper_student eps on s.examid=eps.examid
+        and s.subjectid=eps.subjectid and s.studentid=eps.studentid
+        where s.examid=#{examid} and s.studentid=#{studentid}
     </select>
     <select id="listByExamId" resultMap="stuResult">
-        select s.examid,s.classid,s.studentid,c.classname,u.username,u.loginname
+        select s.examid,s.classid,s.studentid,c.classname,u.username,u.loginname,u.usersex,u.examno
         from e_class_student s left join t_user u on s.studentid=u.userid
         left join e_class c on s.classid=c.classid
         where s.examid=#{stu.examid}