完善对接接口

smarking/src/main/resources/mapper/exam/MsClassStudentMapper.xml

@@ -50,9 +50,10 @@
     </select>
     <!--考生信息列表-->
     <select id="listAll" resultType="java.util.Map">
-        select es.mcsid,es.examid,es.classid,es.subjectid,u.username,u.examno,u.usersex,ec.classname
+        select es.mcsid,es.examid,es.classid,es.subjectid,u.username,u.examno,u.usersex,ec.classname,ps.mpsid,ps.sstate
         from ms_class_student es left join t_user u on es.studentid = u.userid
         left join ms_class ec on es.classid=ec.classid and es.examid=ec.examid and es.subjectid=ec.subjectid
+        left join ms_paper_student ps on es.examid=ps.examid and es.subjectid=ps.subjectid and es.studentid=ps.studentid
         where es.examid=#{cs.examid} and ec.schoolid=#{cs.schoolid}
         <if test="cs.classid!=null and cs.classid!=0">
             and es.classid=#{cs.classid}

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -134,7 +134,7 @@
     <!--单科设置信息-->
     <select id="getSet" resultType="java.util.Map">
         <if test="exammode!=3">
-            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.mpid,3 as correcttype
+            select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.mpid,p.yjstate,3 as correcttype
             ,count(distinct ps.mpsid) as stunum
             ,count(distinct if(ps.batchid is not null,ps.mpsid,null)) as scannum
             ,count(distinct pb.mblockid) as blocknum