监控列表

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

@@ -57,7 +57,7 @@ public class ESubjectBadstudentController {
         Integer classid = invigilate.getClassid();
         Integer page = invigilate.getPage();
         Integer pageSize = invigilate.getPageSize();
-        N_Utils.validation(new Object[]{teacherid, "教师id", 1, esid, "考试科目id", page, "页码", 1, pageSize, "显示条数", 1});
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, esid, "考试科目id", 1, page, "页码", 1, pageSize, "显示条数", 1});
         Map map = eSubjectBadstudentService.getJkDetail(esid, teacherid);
         String classids = map.get("classids").toString();
         PageHelper.startPage(page, pageSize);
@@ -81,11 +81,10 @@ public class ESubjectBadstudentController {
         Integer classid = invigilate.getClassid();
         Integer page = invigilate.getPage();
         Integer pageSize = invigilate.getPageSize();
-        N_Utils.validation(new Object[]{esid, "考试科目id", page, "页码", 1, pageSize, "显示条数", 1});
+        N_Utils.validation(new Object[]{esid, "考试科目id", 1, page, "页码", 1, pageSize, "显示条数", 1});
         Map map = eSubjectBadstudentService.getJkDetail(esid, 0);
-        String classids = map.get("classids").toString();
         PageHelper.startPage(page, pageSize);
-        List<Map> list = eSubjectBadstudentService.listStu(esid, classids, classid, invigilate.getCreatename());
+        List<Map> list = eSubjectBadstudentService.listStu(esid, null, classid, invigilate.getCreatename());
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         map.put("pageResult", pageResult);
         return new ResultVo(0, "获取成功", map);

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

@@ -37,7 +37,7 @@ public class ESubjectBadstudentService {
     public Map getJkDetail(Integer esid, Integer teacherid) {
         Map map = eSubjectMapper.getESubjectByEsId(esid);//考试科目基本信息
         List<Map> classes = eClassMapper.listByExamId((Integer) map.get("examid"));//考试班级
-        String classids = null;
+        String classids = "";
         if (teacherid != 0) {
             Map claMap = eSubjectBadstudentMapper.getClass(esid, teacherid);//教师监考班级
             if (claMap.get("majored").equals(0)) {//教师不是主监考
@@ -65,7 +65,7 @@ public class ESubjectBadstudentService {
 
     //教师监考班级ids
     public String getClassIds(Integer esid, Integer teacherid) {
-        String classids = null;
+        String classids = "";
         if (teacherid != 0) {
             Map claMap = eSubjectBadstudentMapper.getClass(esid, teacherid);//教师监考班级
             if (claMap.get("majored").equals(0)) {//教师不是主监考

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

@@ -35,20 +35,19 @@
         from e_subject_invigilate ei left join e_subject es on ei.esid=es.esid
         left join e_base eb on eb.examid = es.examid
         left join e_class ec on eb.examid = ec.examid
-        <where>
-            <if test="teacherid!=null and teacherid!=0">
-                and ei.teacherid=#{teacherid}
-            </if>
-            <if test="examid!=null and examid!=0">
-                and es.examid=#{examid}
-            </if>
-            <if test="esstate==1">
-                and concat(es.sdate,' ',es.endtime)>now()
-            </if>
-            <if test="esstate==2">
-                and concat(es.sdate,' ',es.endtime)&lt;=now()
-            </if>
-        </where>
+        where eb.deleted=1 and eb.examstate!=0
+        <if test="teacherid!=null and teacherid!=0">
+            and ei.teacherid=#{teacherid}
+        </if>
+        <if test="examid!=null and examid!=0">
+            and es.examid=#{examid}
+        </if>
+        <if test="esstate==1">
+            and concat(es.sdate,' ',es.endtime)>now()
+        </if>
+        <if test="esstate==2">
+            and concat(es.sdate,' ',es.endtime)&lt;=now()
+        </if>
         group by es.esid
         <if test="esstate==1">
             order by abs(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime))-UNIX_TIMESTAMP())
@@ -56,6 +55,7 @@
         <if test="esstate==2">
             order by es.sdate desc,es.endtime desc
         </if>)es left join e_paper_student eps on es.esid = eps.esid and eps.classid in(es.classids)
+        group by es.esid
     </select>
 
 </mapper>