监考设置列表完善

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

         String esids = subjects.stream().map(s -> s.get("esid").toString()).collect(Collectors.joining(","));
         List<EITeacherVo> users = eSubjectInvigilateMapper.listUserByEsIds(esids);
         List<Map> classes = eClassMapper.listByExamId(examid);//考试班级
+        int classnum = classes.size();
         for (Map s : subjects) {
             Integer esid = (Integer) s.get("esid");
             if (N_Utils.isListEmpty(users)) users = new ArrayList<>();
             String majorname = users.stream().filter(u -> esid.equals(u.getEsid()) && u.getMajored() == 1)
                     .map(u -> u.getUsername()).distinct().collect(Collectors.joining("、"));
             s.put("majorname", majorname);
-            long einum = users.stream().filter(u -> !N_Utils.isEmptyInteger(u.getClassid()))
-                    .map(u -> u.getClassid()).distinct().count();
+            long einum;
+            if (N_Utils.isNotEmpty(majorname)) {
+                einum = 0;
+            } else {
+                einum = users.stream().filter(u -> esid.equals(u.getEsid()) && !N_Utils.isEmptyInteger(u.getClassid()))
+                        .map(u -> u.getClassid()).distinct().count();
+                einum = classnum - einum;
+            }
             s.put("einum", einum);
             for (Map c : classes) {
                 Integer classid = (Integer) c.get("classid");

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

     <!--考试设置状态-->
     <select id="getSetState" resultType="java.util.Map">
         select count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
-        ,min(es.esstate)esstate,min(ifnull(ep.correcttype,0))correcttype
+        ,min(es.esstate)esstate,min(es.pstate)pstate,min(ifnull(ep.correcttype,0))correcttype
         ,(case when b.exammode=1 then (count(distinct es.esid)-count(distinct ei.esid))
         else (select sum(ec.classnum)*count(distinct es.esid)-(select count(ps.epsid) from e_paper_student ps
         where ps.examid=b.examid and ps.sstate in(0,1)) from e_class ec

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

     </delete>
     <!--监考设置列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
+        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.pstate,s.subjectname
         ,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
         from e_subject s left join e_paper ep on s.esid = ep.esid
         where s.examid=#{examid} group by s.esid