监考人查看

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

@@ -120,7 +120,7 @@ public class ESubjectInvigilateController {
     public ResultVo detail(@RequestBody ESubject vo) {
         Integer esid = vo.getEsid();
         N_Utils.validation(new Object[]{esid, "考试科目id", 1});
-        List<Map> list = eSubjectInvigilateService.listByEsId(esid);
+        Map list = eSubjectInvigilateService.listByEsId(esid);
         return new ResultVo(0, "获取成功", list);
     }
 

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

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 public class ESubjectInvigilateService {
@@ -48,15 +48,14 @@ public class ESubjectInvigilateService {
     }
 
     //监考人查看
-    public List<Map> listByEsId(Integer esid) {
+    public Map listByEsId(Integer esid) {
+        Map map = new HashMap();
         Integer examId = eSubjectMapper.getExamIdByEsId(esid);//根据考试科目id获取考试id
         List<Map> list = eClassMapper.listByExamId(examId);//考试班级
         List<Map> users = eSubjectInvigilateMapper.listByEsId(esid);//考试监考人
-        for (Map map : list) {
-            List<Map> teachers = users.stream().filter(u -> u.get("classid").equals(map.get("classid"))).collect(Collectors.toList());
-            map.put("teachers", teachers);
-        }
-        return list;
+        map.put("classes", list);
+        map.put("teachers", users);
+        return map;
     }
 
     //监考人删除