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

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

@@ -14,9 +14,9 @@
     <!--考试列表-->
     <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 es.subjectname separator '|')subjectname
+        ,b.examstate,group_concat(distinct es.subjectname order by es.esid 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
+        ,min(es.esstate)esstate,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(ps.epsid) from e_class ec
         left join e_paper_student ps on ec.examid=ps.examid and ps.sstate in(0,1)
@@ -51,7 +51,7 @@
     </select>
     <!--考试基本信息(带考试人数)-->
     <select id="findById2" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.examtype
+        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid
         ,(select sum(c.classnum) from e_class c where c.examid=b.examid)examnum
         from e_base b where b.examid=#{examid}
     </select>
@@ -63,7 +63,7 @@
     <select id="getExamStateById" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
         select eb.examid,eb.examname,eb.gradeid,eb.examstate,eb.schoolid
         ,count(case when es.esstate!=1 then es.esid else null end)wwcnum
-        ,min(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime)))begintime
+        ,min(ifnull(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime)),0))begintime
         from e_base eb left join e_subject es on eb.examid = es.examid
         where eb.examid=#{examid}
     </select>