监控列表兼容集团校

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

@@ -164,6 +164,28 @@ public class ESubjectInvigilateController {
         return new ResultVo(0, "获取成功", pageResult);
     }
 
+    /**
+     * @Description 教师监考-监控列表（兼容集团校）
+     * @Date 2023/8/30 15:24
+     * @Author YWX
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_jkjt")
+    public ResultVo listJtJkSubject(@RequestBody ESubject subject) {
+        Integer teacherid = subject.getTeacherid();
+        Integer esstate = subject.getEsstate();
+        Integer schoolid = subject.getSchoolid();
+        Integer page = subject.getPage();
+        Integer pageSize = subject.getPageSize();
+        N_Utils.validation(new Object[]{teacherid, "教师id", 1, schoolid, "学校id", 1
+                , page, "页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = eSubjectInvigilateService.listJtJkSubject(0, teacherid, esstate, schoolid);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
     /*
      * 管理员监考-监控列表
      * @Param [subject]
@@ -184,6 +206,28 @@ public class ESubjectInvigilateController {
         return new ResultVo(0, "获取成功", pageResult);
     }
 
+    /**
+     * @Description 管理员监考-监控列表（兼容集团校）
+     * @Date 2023/8/30 15:44
+     * @Author YWX
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_ejkjt")
+    public ResultVo listExamJtJkSubject(@RequestBody ESubject subject) {
+        Integer examid = subject.getExamid();
+        Integer esstate = subject.getEsstate();
+        Integer schoolid = subject.getSchoolid();
+        Integer page = subject.getPage();
+        Integer pageSize = subject.getPageSize();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, schoolid, "学校id", 1
+                , page, "页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = eSubjectInvigilateService.listJtJkSubject(examid, 0, esstate, schoolid);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
+
     /*
      * 缺考学生列表
      * @Param [vo]

sexam/src/main/java/com/xhkjedu/sexam/model/exam/ESubject.java

@@ -3,8 +3,7 @@ package com.xhkjedu.sexam.model.exam;
 import com.xhkjedu.model.BaseBean;
 import lombok.Data;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 @Table(name = "e_subject")
 @Data
@@ -42,4 +41,8 @@ public class ESubject extends BaseBean {
 
     //科目名称
     private String subjectname;
+
+    @Transient
+    //学校id
+    private Integer schoolid;
 }

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

@@ -14,10 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -155,6 +152,65 @@ public class ESubjectInvigilateService {
         return list;
     }
 
+    /**
+     * @Description 教师监考-监控列表（兼容集团校）
+     * @Date 2023/8/30 15:24
+     * @Author YWX
+     * @Param [examid, teacherid, esstate, schoolid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listJtJkSubject(Integer examid, Integer teacherid, Integer esstate, Integer schoolid) {
+        int timestamp = N_Utils.getSecondTimestamp();
+        String strtime = N_Utils.getStrtimeTimestamp(timestamp, "yyyy-MM-dd HH:mm:ss");
+        List<Map> list = eSubjectInvigilateMapper.listJkSubject(examid, teacherid, esstate, strtime);
+        for (Map map : list) {
+            List<Map> classes = JSON.parseArray(map.get("classnames").toString(), Map.class);
+            List<Map> classList = new ArrayList<>();
+            Integer majored = (Integer) map.get("majored");
+            if (majored == 1) {//主监考
+                classList.addAll(classes);
+            } else {
+                String[] classids2 = map.get("classids").toString().split(",");
+                for (String classid : classids2) {
+                    Map cmap = classes.stream().filter(c -> c.get("classid").toString().equals(classid)).findFirst().orElse(null);
+                    if (cmap != null) classList.add(cmap);
+                }
+            }
+            map.remove("classids");
+            map.remove("classnames");
+            List<Map> schools = new ArrayList<>();
+            Map<Integer, List<Map>> collect = classList.stream().collect(Collectors.groupingBy(c -> (Integer) c.get("schoolid")));
+            for (Map.Entry<Integer, List<Map>> entry : collect.entrySet()) {
+                List<Map> clist = entry.getValue();
+                Map school = new HashMap();
+                school.put("schoolid", entry.getKey());
+                for (int i = 0; i < clist.size(); i++) {
+                    Map c = clist.get(i);
+                    if (i == 0) {
+                        school.put("schoolname", c.get("schoolname"));
+                    }
+                    c.remove("schoolid");
+                    c.remove("schoolname");
+                }
+                school.put("classes", clist);
+                schools.add(school);
+            }
+            if (schools.size() > 1) {
+                //把本校放在第一个位置
+                for (int i = 0; i < schools.size(); i++) {
+                    Map rtnMap = schools.get(i);
+                    Integer schoolid2 = Integer.parseInt(rtnMap.get("schoolid").toString());
+                    if (schoolid.equals(schoolid2)) {
+                        Collections.swap(schools, i, 0);
+                        break;
+                    }
+                }
+            }
+            map.put("schools", schools);
+        }
+        return list;
+    }
+
     //根据考试科目id获取考试科目基本信息
     public Map getESubjectByEsId(Integer esid) {
         return eSubjectMapper.getESubjectByEsId(esid);

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

@@ -29,10 +29,12 @@
         from(select es.esid,es.sdate,es.begintime,es.endtime,es.esstate,es.subjectname,es.pstate
         ,eb.examname,eb.gradeid,eb.examtype,eb.examstate,max(ei.majored)majored
         ,(case when max(ei.majored)=0 then group_concat(distinct ei.classid) else group_concat(distinct ec.classid) end)classids
-        ,concat('[',group_concat(distinct json_object('classid',ec.classid,'classname',ec.classname)),']')classnames
+        ,concat('[',group_concat(distinct json_object('classid',ec.classid,'classname',ec.classname
+            ,'schoolid',ec.schoolid,'schoolname',s.schoolname)),']')classnames
         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
+        left join t_school s on ec.schoolid = s.schoolid
         where eb.deleted=1 and eb.examstate!=0 and eb.exammode=1 and eb.monitored=1
         <if test="teacherid!=null and teacherid!=0">
             and ei.teacherid=#{teacherid}