Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 @Table(name = "e_subject")
 @Data
@@ -41,7 +40,6 @@ public class ESubject extends BaseBean {
     //设置时间
     private Integer handletime;
 
-    @Transient
     //科目名称
     private String subjectname;
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestion.java

@@ -67,8 +67,11 @@ public class EPaperStudentQuestion extends BaseBean {
     //批改时间
     private Integer checktime;
 
-    //作答情况0默认1优秀2违规
-    private Integer goodbad;
+    //优秀试卷0默认1优秀
+    private Integer good;
+
+    //违纪试卷0默认1违纪
+    private Integer bad;
 
     //学生答题卡作答图片
     private String stupic;

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

@@ -90,10 +90,9 @@ public class EBaseService {
         students.forEach(s -> s.setExamid(examid));
         eClassStudentMapper.insertList(students);
 
-        //考试科目、试卷
+        //考试科目
         List<String> subjectids = model.getSubjectids();
         List<ESubject> subjects = new ArrayList<>();//考试科目
-        List<EPaper> papers = new ArrayList<>();//考试试卷
         String examdate = model.getExamdate();//考试时间
         for (String subjectid : subjectids) {
             ESubject s = new ESubject();
@@ -102,28 +101,9 @@ public class EBaseService {
             s.setSdate(examdate);
             s.setEsstate(0);
             subjects.add(s);
-            EPaper p = new EPaper();
-            p.setExamid(examid);
-            p.setSubjectid(subjectid);
-            p.setPtype(0);
-            p.setPnum(0);
-            p.setPscore(0.0);
-            p.setAnswered(0);
-            p.setCorrecttype(0);
-            papers.add(p);
         }
         eSubjectMapper.insertList(subjects);//考试科目
 
-        Integer createid = model.getCreateid();
-        Integer createtime = model.getCreatetime();
-        for (int i = 0; i < papers.size(); i++) {
-            EPaper ePaper = papers.get(i);
-            ePaper.setEsid(subjects.get(i).getId());
-            ePaper.setCreateid(createid);
-            ePaper.setCreatetime(createtime);
-        }
-        ePaperMapper.insertList(papers);//考试试卷
-
         return null;
     }
 

sexam/src/main/java/com/xhkjedu/sexam/service/notice/NoticeService.java

@@ -104,11 +104,12 @@ public class NoticeService {
             } else {//通知对象2老师
                 List<Integer> userids = msgList.stream().map(m -> m.getUserid()).distinct().collect(Collectors.toList());
                 List<Map> users = userMapper.listPhoneByUserIds(userids);//根据用户ids查找手机号
+                Map<Integer, TMsg> msgMap = msgList.stream().collect(Collectors.toMap(m -> m.getUserid(), m -> m));
                 for (int i = 0; i < users.size(); i++) {
                     Map u = users.get(i);
                     String userphone = u.get("userphone").toString();
                     if (N_Utils.isEmpty(userphone)) continue;
-                    TMsg m = msgList.get(i);
+                    TMsg m = msgMap.get(u.get("userid"));
                     m.setUserphone(userphone);
                     m.setCreatetime(createtime);
                     msgs.add(m);

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

@@ -14,7 +14,7 @@
     <!--考试列表-->
     <select id="listAll" resultType="java.util.Map">
         select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored
-        ,b.examstate,group_concat(distinct s.subjectname order by s.subjectorder separator '|')subjectname
+        ,b.examstate,group_concat(distinct es.subjectname separator '|')subjectname
         ,count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
         ,min(es.esstate)esstate,min(ep.correcttype)correcttype
         ,(case when b.exammode=1 then (count(distinct es.esid)-count(distinct ei.esid))
@@ -22,7 +22,6 @@
         left join e_paper_student ps on ec.examid=ps.examid and ps.sstate in(0,1)
         where ec.examid=b.examid) end)papernum
         from e_base b left join e_subject es on es.examid=b.examid
-        left join t_subject s on es.subjectid=s.subjectid
         left join e_paper ep on ep.esid = es.esid
         left join e_subject_invigilate ei on ei.esid = es.esid
         where b.schoolid=#{base.schoolid} and b.deleted=1

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

@@ -7,9 +7,8 @@
     </delete>
     <!--监考设置列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate
+        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
         ,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
-        ,(select ts.subjectname from t_subject ts where ts.subjectid=s.subjectid)subjectname
         ,(select group_concat(distinct u.username separator '、')
         from e_subject_invigilate ei left join t_user u on ei.teacherid = u.userid
         where ei.esid=s.esid and ei.majored=1)majorname
@@ -24,7 +23,7 @@
     </select>
     <!--教师监考-监控列表-->
     <select id="listJkSubject" resultType="java.util.Map">
-        select es.esid,es.sdate,es.begintime,es.endtime,es.esstate,ts.subjectname
+        select es.esid,es.sdate,es.begintime,es.endtime,es.esstate,es.subjectname
         ,eb.examname,eb.gradeid,eb.examtype,sum(ec.classnum)examnum
         ,count(case when eps.sstate=0 then eps.epsid else null end) wjcnum
         ,count(case when eps.sstate=1 then eps.epsid else null end)jcnum
@@ -34,7 +33,6 @@
         from e_subject es left join e_base eb on eb.examid = es.examid
         left join e_class ec on eb.examid = ec.examid
         left join e_paper_student eps on es.esid = eps.esid
-        left join t_subject ts on es.subjectid = ts.subjectid
         where es.teacherid=#{teacherid}
         <if test="esstate==1">
             and concat(es.sdate,' ',es.endtime)>now()

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

@@ -12,9 +12,8 @@
     <!--考试下所有科目-->
     <select id="listExamSubjects" resultType="com.xhkjedu.sexam.vo.exam.ESubjectVo">
         select es.esid,es.subjectid,es.sdate,es.begintime,es.endtime,es.teacherid,
-        u.username teachername,es.esstate,s.subjectname
+        u.username teachername,es.esstate,es.subjectname
         from e_subject es left join t_user u on es.teacherid=u.userid
-        left join t_subject s on es.subjectid=s.subjectid
         where es.examid=#{examid} order by s.subjectorder
     </select>
 
@@ -29,9 +28,8 @@
     </update>
     <!--考试科目列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select es.subjectid,s.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,u.username
-        from e_subject es left join t_subject s on es.subjectid=s.subjectid
-        left join t_user u on es.teacherid=u.userid
+        select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.teacherid,u.username
+        from e_subject es left join t_user u on es.teacherid=u.userid
         where examid=#{examid}
     </select>
     <!--根据考试科目id获取考试id-->
@@ -40,25 +38,23 @@
     </select>
     <!--考试科目设置列表-->
     <select id="listSubjectSet" resultType="java.util.Map">
-        select es.subjectid,s.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
+        select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
         ,ep.correcttype
         ,(select count(*) from e_subject_invigilate ei where ei.esid=es.esid)jkjsnum
         ,count(case when eps.sstate=3 then eps.epsid else null end)qknum
         ,count(case when eps.sstate=2 then eps.epsid else null end)tjnum
         ,ifnull(truncate(count(case when eps.checked=2 then eps.epsid else null end)*100/
         count(case when eps.sstate=2 then eps.epsid else null end),0),0)pyrate
-        from e_subject es left join t_subject s on es.subjectid=s.subjectid
-        left join e_paper ep on es.esid = ep.esid
+        from e_subject es left join e_paper ep on es.esid = ep.esid
         left join e_paper_student eps on ep.epid = eps.epid
         where es.examid=#{examid}
         group by es.esid
     </select>
     <!--考试科目阅卷设置列表-->
     <select id="listSubjectCSet" resultType="java.util.Map">
-        select es.subjectid,s.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
+        select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
         ,ep.ptype,ep.epid,ep.pnum,ep.pscore,ep.correcttype
-        from e_subject es left join t_subject s on es.subjectid=s.subjectid
-        left join e_paper ep on es.esid = ep.esid
+        from e_subject es left join e_paper ep on es.esid = ep.esid
         where es.examid=#{examid}
     </select>
     <!--根据考试科目id获取考试科目基本信息-->