Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/resources/mapper/papercheck/MsPaperCheckMapper.xml

     </select>
     <!--获取题块分配教师列表-->
     <select id="listTeacherByMBlockId" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
-        select pct.mpctid, pct.teacherid, pct.tasknum,pct.mpid,pct.mblockid
+        select pct.mpctid, pct.teacherid, count(pctt.mpcttid) as tasknum,pct.mpid,pct.mblockid
         ,count(if(pctt.checkstate in(2,3),1,null)) as checkednum,count(pctt.mpcttid) as assignednum
         from ms_paper_check_teacher pct left join ms_paper_check_teacher_task pctt on pct.mblockid = pctt.mblockid and pct.teacherid = pctt.teacherid
         where pct.mpid = #{mpid} and pct.mblockid = #{mblockid}

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherMapper.xml

     </update>
     <!--题块阅卷教师列表-->
     <select id="listCheckTeacher" resultType="java.util.Map">
-        select pct.mpid,pct.mblockid,pct.teacherid,pct.tasknum,u.username as teachername
+        select pct.mpid,pct.mblockid,pct.teacherid,count(pctt.mpcttid) as tasknum,u.username as teachername
         ,count(if(pctt.checkstate=3,1,null)) as checknum
         from ms_paper_check_teacher pct left join t_user u on pct.teacherid = u.userid
         left join ms_paper_check_teacher_task pctt on  pct.mblockid = pctt.mblockid and pct.teacherid = pctt.teacherid
     </select>
     <!--获取教师题块批阅信息-->
     <select id="getTeacherBlockCheck" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
-        select pct.mpctid,pct.mpid,pct.mblockid,pct.teacherid,pct.tasknum,pct.deleted
+        select pct.mpctid,pct.mpid,pct.mblockid,pct.teacherid,count(pctt.mpcttid) as tasknum,pct.deleted
         ,count(if(pctt.checkstate in(2,3),1,null)) as checkednum
         ,group_concat(if(pctt.checkstate=1,pctt.mpcttid,null)) as mpcttids
         from ms_paper_check_teacher pct left join ms_paper_check_teacher_task pctt on  pct.mblockid = pctt.mblockid and pct.teacherid = pctt.teacherid

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

     <!--获取教师批阅数量-->
     <select id="getCheckNum" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
         <if test="param.dispenseway!=null and param.dispenseway!=2">
-            select pct.tasknum,count(if(pctt.checkstate=3,1,null)) as checkednum
+            select count(pctt.mpcttid) as tasknum,count(if(pctt.checkstate=3,1,null)) as checkednum
             from ms_paper_check_teacher pct left join ms_paper_check_teacher_task pctt on pct.mpid=pctt.mpid and pct.teacherid=pctt.teacherid pct.mblockid=pctt.mblockid
             where pct.mpid=#{param.mpid} and pct.teacherid=#{param.handleid} and pct.mblockid=#{param.mblockid}
         </if>