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

smarking/src/main/java/com/xhkjedu/smarking/controller/papercheck/MsPaperCheckController.java

@@ -32,8 +32,10 @@ public class MsPaperCheckController {
     public ResultVo setCheckType(@RequestBody MsPaperCheck msPaperCheck) {
         N_Utils.validation(new Object[]{
                 msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMsid(), "考试科目id", 1
                 , msPaperCheck.getMblockid(), "题块id", 1
                 , msPaperCheck.getChecktype(), "评卷方式", 1
+                , msPaperCheck.getCreateid(), "创建人id", 1
         });
         msPaperCheckService.add(msPaperCheck);
         return new ResultVo(0, "设置成功");
@@ -67,8 +69,10 @@ public class MsPaperCheckController {
     public ResultVo setArbitrate(@RequestBody MsPaperCheck msPaperCheck) {
         N_Utils.validation(new Object[]{
                 msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMsid(), "考试科目id", 1
                 , msPaperCheck.getMblockid(), "题块id", 1
                 , msPaperCheck.getArbitrateid(), "仲裁教师id", 1
+                , msPaperCheck.getCreateid(), "创建人id", 1
         });
         msPaperCheckService.setArbitrate(msPaperCheck);
         return new ResultVo(0, "设置成功");
@@ -85,9 +89,11 @@ public class MsPaperCheckController {
     public ResultVo setCheckTeacher(@RequestBody MsPaperCheck msPaperCheck) {
         N_Utils.validation(new Object[]{
                 msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMsid(), "考试科目id", 1
                 , msPaperCheck.getMblockid(), "题块id", 1
                 , msPaperCheck.getTeachers(), "阅卷教师", 3
                 , msPaperCheck.getCorrecttype(), "批阅设置", 1
+                , msPaperCheck.getCreateid(), "创建人id", 1
         });
         msPaperCheckService.setCheckTeacher(msPaperCheck);
         return new ResultVo(0, "设置成功");
@@ -124,6 +130,7 @@ public class MsPaperCheckController {
         Integer dispenseway = msPaperCheck.getDispenseway();
         N_Utils.validation(new Object[]{
                 msPaperCheck.getMpid(), "试卷id", 1
+                , msPaperCheck.getMsid(), "考试科目id", 1
                 , msPaperCheck.getMblockid(), "题块id", 1
                 , dispenseway, "分配方式", 1
                 , msPaperCheck.getCreateid(), "创建人id", 1

smarking/src/main/java/com/xhkjedu/smarking/controller/papercheck/MsPaperCheckTeacherTaskController.java

@@ -131,4 +131,19 @@ public class MsPaperCheckTeacherTaskController {
         N_Utils.validation(new Object[]{param.getHandleid(), "操作人ID", 1, param.getMpid(), "试卷ID", 1});
         return new ResultVo(0, "查询成功", msPaperCheckTeacherTaskService.getCorrectBlock(param));
     }
+
+    /**
+     * @Description 阅卷进度-按试题
+     * @Date 2024/11/8 16:19
+     * @Author YWX
+     * @Param [param]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_by_question")
+    public ResultVo listByQuestion(@RequestBody MsCheckParam param) {
+        Integer mpid = param.getMpid();
+        N_Utils.validation(new Object[]{mpid, "试卷ID", 1});
+        List<Map> list = msPaperCheckTeacherTaskService.listByQuestion(mpid);
+        return new ResultVo(0, "查询成功", list);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

@@ -36,9 +36,12 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
     //获取考试下所有科目名称
     List<Map<String,String>> listSubjectNameByExamId(@Param("examid") Integer examid);
 
-    //根据试卷id获取阅卷状态
-    Integer getCheckStateByMpId(@Param("mpid") Integer mpid);
+    //根据考试科目id获取阅卷状态
+    Integer getCheckStateByMsId(@Param("msid") Integer msid);
 
     //更改考试科目监考设置状态
     void updateInvigilateStateByMsId(@Param("msid") Integer msid,@Param("invigilatestate") int invigilatestate);
+
+    //更改考试科目阅卷设置状态
+    void updateCheckSetByMsId(@Param("msid") Integer msid, @Param("checkset") Integer checkset,@Param("correcttype") Integer correcttype);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckMapper.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
     //根据题块id获取阅卷方式id
-    Integer getMpcIdByMBlockId(@Param("mblockid") Integer mblockid);
+    Integer getMpcIdByMBlockId(@Param("mpid") Integer mpid, @Param("mblockid") Integer mblockid);
 
     //阅卷分配-按题块列表（线下）
     List<Map> listPaperCheck(@Param("mpid") Integer mpid);
@@ -30,9 +30,6 @@ public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
     //根据题块id获取阅卷信息
     MsPaperCheck findByMBlockId(@Param("mpid") Integer mpid,@Param("mblockid") Integer mblockid);
 
-    //根据考试科目id获取阅卷信息
-    List<MsPaperCheck> listByMsId(@Param("msid") Integer msid);
-
     //获取学生作答及批阅信息
     List<MsPaperCheckVo> listStudentByMBlockId(@Param("mblockid") Integer mblockid,@Param("numtype") Integer numtype);
     List<MsPaperCheckVo> listStudentByMpsqId(@Param("mblockid") Integer mblockid,@Param("numtype") Integer numtype);
@@ -51,4 +48,7 @@ public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
 
     //根据mpid和mblockids删除阅卷方式
     void deleteByMpIdAndBlockIds(@Param("mpid") Integer mpid,@Param("mblockids") List<Integer> mblockids);
+
+    //获取阅卷设置状态
+    Integer getCheckSetById(@Param("mpcid") Integer mpcid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckTeacherTaskMapper.java

@@ -30,7 +30,8 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
     List<Map> listByBlock(@Param("mpid") Integer mpid);
 
     //阅卷进度-按题块-查看详情
-    List<Map> detailByBlock(@Param("mpid") Integer mpid, @Param("mblockid") Integer mblockid);
+    List<Map> detailByBlock(@Param("mpid") Integer mpid, @Param("mblockid") Integer mblockid
+            , @Param("dispenseway") Integer dispenseway,@Param("checktype") Integer checktype);
 
     //阅卷进度-按教师
     List<Map> listByTeacher(@Param("mpid") Integer mpid);
@@ -54,4 +55,7 @@ public interface MsPaperCheckTeacherTaskMapper extends TkMapper<MsPaperCheckTeac
 
     //删除教师阅卷任务
     void deleteByMpsbids(@Param("mpsbids") String mpsbids);
+
+    //阅卷进度-按试题
+    List<Map> listByQuestion(@Param("mpid") Integer mpid,@Param("correcttype") Integer correcttype);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaper.java

@@ -35,6 +35,8 @@ public class MsPaper extends BaseBean {
     private Double pscore;
     //是否设置正确答案0未设置1已设置
     private Integer answered;
+    //批阅设置：1按班设置2按题设置3按题块设置
+    private Integer correcttype;
     //是否有附件0没有1有附件
     private Integer hasfile;
     //听力允许播放次数0不限制

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.service.exam;
 
+import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
 import com.xhkjedu.smarking.model.exam.MsSubject;
@@ -72,12 +73,17 @@ public class MsSubjectService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void updateCheckState(Integer msid, Integer handleid, int checkstate) {
+        MsSubject subject = msSubjectMapper.selectByPrimaryKey(msid);
+        if (subject == null) {
+            throw new ServiceException("考试科目不存在");
+        }
 
         MsSubject msSubject = new MsSubject();
         msSubject.setMsid(msid);
         msSubject.setHandleid(handleid);
         msSubject.setCheckstate(checkstate);
         msSubject.setHandletime(N_Utils.getSecondTimestamp());
+        msSubject.setCheckset(2);
         msSubjectMapper.updateByPrimaryKeySelective(msSubject);
 
         msPaperCheckMapper.updateCheckStateByMsId(msid, checkstate);//更新题块阅卷状态

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckService.java

@@ -41,20 +41,21 @@ public class MsPaperCheckService {
      * @Return void
      **/
     public void add(MsPaperCheck msPaperCheck) {
-        Integer checkstate = msSubjectMapper.getCheckStateByMpId(msPaperCheck.getMpid());//根据试卷id获取阅卷状态
+        Integer checkstate = msSubjectMapper.getCheckStateByMsId(msPaperCheck.getMsid());//根据考试科目id获取阅卷状态
         if (checkstate.equals(0)) throw new ServiceException("开始阅卷后不支持修改");
         saveOrUpdate(msPaperCheck);
     }
 
     //添加或更新阅卷方式
     private void saveOrUpdate(MsPaperCheck msPaperCheck) {
-        Integer mpcid = msPaperCheckMapper.getMpcIdByMBlockId(msPaperCheck.getMblockid());
+        Integer mpcid = msPaperCheckMapper.getMpcIdByMBlockId(msPaperCheck.getMpid(), msPaperCheck.getMblockid());
         if (N_Utils.isTrueInteger(mpcid)) {
             msPaperCheck.setMpcid(mpcid);
             msPaperCheckMapper.updateByPrimaryKeySelective(msPaperCheck);
         } else {
             msPaperCheck.setCreatetime(N_Utils.getSecondTimestamp());
             msPaperCheckMapper.insertSelective(msPaperCheck);
+            msSubjectMapper.updateCheckSetByMsId(msPaperCheck.getMsid(), 1, msPaperCheck.getCorrecttype());//更改考试科目阅卷设置状态
         }
     }
 

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckTeacherTaskService.java

@@ -1,8 +1,11 @@
 package com.xhkjedu.smarking.service.papercheck;
 
 import com.xhkjedu.exception.ServiceException;
+import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
+import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckMapper;
 import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherTaskMapper;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
+import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.papercheck.MsPaperCheck;
 import com.xhkjedu.smarking.vo.papercheck.MsCheckParam;
 import com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo;
@@ -25,6 +28,10 @@ public class MsPaperCheckTeacherTaskService {
     private MsPaperCheckTeacherTaskMapper msPaperCheckTeacherTaskMapper;
     @Resource
     private UserMapper userMapper;
+    @Resource
+    private MsPaperCheckMapper msPaperCheckMapper;
+    @Resource
+    private MsPaperMapper msPaperMapper;
 
     /**
      * @Description 阅卷进度-按题块
@@ -45,7 +52,22 @@ public class MsPaperCheckTeacherTaskService {
      * @Return java.util.List<java.util.Map>
      **/
     public List<Map> detailByBlock(Integer mpid, Integer mblockid) {
-        return msPaperCheckTeacherTaskMapper.detailByBlock(mpid, mblockid);
+        MsPaperCheck check = msPaperCheckMapper.findByMBlockId(mpid, mblockid);
+        if (check == null) {
+            throw new ServiceException("该题块不存在");
+        }
+        Integer dispenseway = check.getDispenseway();
+        List<Map> list = msPaperCheckTeacherTaskMapper.detailByBlock(mpid, mblockid, dispenseway, check.getChecktype());
+        if (dispenseway.equals(2)) {
+            int totalNum = list.stream().mapToInt(m -> N_Utils.obj2Int(m.get("totalNum"))).sum();
+            int totalCheckedNum = list.stream().mapToInt(m -> N_Utils.obj2Int(m.get("checkedNum"))).sum();
+            int uncheckedNum = totalNum - totalCheckedNum;
+            for (Map m : list) {
+                m.put("totalNum", totalNum);
+                m.put("uncheckedNum", uncheckedNum);
+            }
+        }
+        return list;
     }
 
     /**
@@ -133,4 +155,23 @@ public class MsPaperCheckTeacherTaskService {
         String msg = "获取成功";
         return new ResultVo(0, msg, map);
     }
+
+    /**
+     * @Description 阅卷进度-按试题
+     * @Date 2024/11/8 16:18
+     * @Author YWX
+     * @Param [mpid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listByQuestion(Integer mpid) {
+        MsPaper paper = msPaperMapper.selectByPrimaryKey(mpid);
+        if (paper == null) {
+            throw new ServiceException("该试卷不存在");
+        }
+        Integer correcttype = paper.getCorrecttype();
+        if (!N_Utils.isTrueInteger(correcttype)) {
+            throw new ServiceException("该试卷未设置批阅方式");
+        }
+        return msPaperCheckTeacherTaskMapper.listByQuestion(mpid, correcttype);
+    }
 }

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

@@ -48,9 +48,9 @@
     <select id="listSubjectNameByExamId" resultType="java.util.Map">
         select subjectid,subjectname from ms_subject where examid=#{examid}
     </select>
-    <!--根据试卷id获取阅卷状态-->
-    <select id="getCheckStateByMpId" resultType="java.lang.Integer">
-        select s.checkstate from ms_paper p inner join ms_subject s on p.msid=s.msid where p.mpid=#{mpid}
+    <!--根据考试科目id获取阅卷状态-->
+    <select id="getCheckStateByMsId" resultType="java.lang.Integer">
+        select s.checkstate from ms_subject s where s.msid=#{msid}
     </select>
 
     <!--更改科目试卷模板设置状态-->
@@ -65,5 +65,11 @@
     <update id="updateInvigilateStateByMsId">
         update ms_subject set invigilatestate=#{invigilatestate} where msid=#{msid}
     </update>
-    
+    <!--更改考试科目阅卷设置状态-->
+    <update id="updateCheckSetByMsId">
+        update ms_subject s inner join ms_paper p on s.msid=p.msid
+        set s.checkset=#{checkset},p.correcttype=#{correcttype}
+        where s.msid=#{msid}
+    </update>
+
 </mapper>

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

@@ -14,11 +14,12 @@
     </delete>
     <!--根据题块id获取阅卷方式id-->
     <select id="getMpcIdByMBlockId" resultType="java.lang.Integer">
-        select mpcid from ms_paper_check where mblockid = #{mblockid}
+        select mpcid from ms_paper_check where mpid = #{mpid} and mblockid = #{mblockid}
     </select>
 
     <resultMap id="paperCheckResultMap" type="java.util.Map">
         <result property="mpid" column="mpid"/>
+        <result property="msid" column="msid"/>
         <result property="mblockid" column="mblockid"/>
         <result property="blockname" column="blockname"/>
         <result property="blockorder" column="blockorder"/>
@@ -38,10 +39,11 @@
     </select>
     <!--阅卷分配-按题块列表（线下）-->
     <select id="listPaperCheck" resultMap="paperCheckResultMap">
-        select pb.mpid,pb.mblockid,pb.blockname,pb.blockorder,pb.bqnum,pb.bqscore
+        select pb.mpid,p.msid,pb.mblockid,pb.blockname,pb.blockorder,pb.bqnum,pb.bqscore
         ,pc.mpcid,pc.checktype,pc.dispenseway
         ,if(pc.checktype=2,(select u.username from t_user u where u.userid=pc.arbitrateid),'') as arbitratename
         from ms_paper_check pc right join ms_paper_block pb on pc.mblockid = pb.mblockid
+        inner join ms_paper p on pb.mpid = p.mpid
         where pb.mpid = #{mpid} and pb.blocktype = 2
         order by pb.blockorder
     </select>
@@ -66,11 +68,6 @@
         select mpcid,mpid,mblockid,checktype,arbitrateid,hidefirstscore,scoreway,finalscore,roundvalue,dispenseway
         from ms_paper_check where mpid = #{mpid} and mblockid = #{mblockid}
     </select>
-    <!--根据考试科目id获取阅卷信息-->
-    <select id="listByMsId" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
-        select mpcid,mpid,mblockid,checktype,arbitrateid,hidefirstscore,scoreway,finalscore,roundvalue,dispenseway
-        from ms_paper_check where msid = #{msid}
-    </select>
     <!--获取学生作答及批阅信息（按题块）-->
     <select id="listStudentByMBlockId" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         select psb.mpsbid,psb.mblockid,psb.checked,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
@@ -99,11 +96,12 @@
         <result property="mblockid" column="mblockid"/>
         <result property="classname" column="classname"/>
         <result property="mpid" column="mpid"/>
+        <result property="msid" column="msid"/>
         <result property="mpcid" column="mpcid"/>
         <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
     </resultMap>
     <select id="listSubjectClass" resultMap="classResultMap">
-        select c.gradeid,mc.classid as mblockid,mc.classname,p.mpid,pc.mpcid
+        select c.gradeid,mc.classid as mblockid,mc.classname,p.mpid,p.msid,pc.mpcid
         from ms_paper p inner join ms_class mc on p.examid=mc.examid and mc.subjectid=p.subjectid
         inner join t_class c on mc.classid=c.classid
         left join ms_paper_check pc on p.mpid=pc.mpid and pc.mblockid=mc.classid
@@ -116,6 +114,7 @@
         <result property="qn" column="qn"/>
         <result property="mblockid" column="mblockid"/>
         <result property="mpid" column="mpid"/>
+        <result property="msid" column="msid"/>
         <result property="mpcid" column="mpcid"/>
         <result property="checktype" column="checktype"/>
         <result property="dispenseway" column="dispenseway"/>
@@ -123,9 +122,10 @@
         <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
     </resultMap>
     <select id="listQuestion" resultMap="questionResultMap">
-        select q.qorder,q.qn,q.mptqid as mblockid,q.mpid,pc.mpcid,pc.checktype,pc.dispenseway
+        select q.qorder,q.qn,q.mptqid as mblockid,q.mpid,p.msid,pc.mpcid,pc.checktype,pc.dispenseway
         ,if(pc.checktype=2,(select u.username from t_user u where u.userid=pc.arbitrateid),'') as arbitratename
         from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid
+        inner join ms_paper p on q.mpid=p.mpid
         where q.mpid=#{mpid} and q.ctype in(3,13,14,15)
     </select>
     <!--获取需要批阅的数量-->
@@ -141,4 +141,10 @@
             where psb.mblockid=#{mblockid}
         </if>
     </select>
+    <!--获取阅卷设置状态-->
+    <select id="getCheckSetById" resultType="java.lang.Integer">
+        select if((checktype=1 or (checktype=2 and arbitrateid is not null)) and dispenseway in(1,2,3) and count(pct.mpctid)>0,2,1)
+        from ms_paper_check pc left join ms_paper_check_teacher pct on pc.mblockid=pct.mblockid and pc.mpid=pct.mpid
+        where pc.mpcid=#{mpcid}
+    </select>
 </mapper>

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

@@ -71,12 +71,32 @@
     </select>
     <!--阅卷进度-按题块-查看详情-->
     <select id="detailByBlock" resultType="java.util.Map">
-        select pctt.teacherid,u.username as teachername
-        ,count(pctt.mpcttid) as total_num,count(if(pctt.checkstate=3,1,null)) as checked_num
-        ,count(if(pctt.checkstate!=3,1,null))as uncheck_num
-        from ms_paper_check_teacher_task pctt left join t_user u on u.userid = pctt.teacherid
-        where pctt.mpid=#{mpid} and pctt.mblockid=#{mblockid}
-        group by pctt.teacherid
+        <if test="dispenseway!=null and dispenseway!=2">
+            select pctt.teacherid,u.username as teachername
+            ,count(pctt.mpcttid) as total_num,count(if(pctt.checkstate=3,1,null)) as checked_num
+            ,count(if(pctt.checkstate!=3,1,null))as uncheck_num
+            from ms_paper_check_teacher_task pctt left join t_user u on u.userid = pctt.teacherid
+            where pctt.mpid=#{mpid} and pctt.mblockid=#{mblockid}
+            group by pctt.teacherid
+        </if>
+        <if test="dispenseway!=null and dispenseway==2">
+            select t.teacherid,u.username as teachername
+            ,sum(t.total_num) as total_num,sum(t.checked_num) as checked_num,sum(t.uncheck_num) as uncheck_num
+            from(select psb.firstcid as teacherid,count(*) as total_num,count(if(psb.firstcime is not null,1,null)) as checked_num
+            ,count(if(psb.firstcime is null,1,null)) as uncheck_num
+            from ms_paper_student_block psb
+            where psb.mpid=#{mpid} and psb.mblockid=#{mblockid}
+            group by psb.firstcid
+            <if test="checktype!=null and checktype==2">
+                union
+                select psb.secondcid as teacherid,count(*) as total_num,count(if(psb.secondctime is not null,1,null)) as checked_num
+                ,count(if(psb.secondctime is null,1,null)) as uncheck_num
+                from ms_paper_student_block psb
+                where psb.mpid=#{mpid} and psb.mblockid=#{mblockid}
+                group by psb.secondcid
+            </if>)t left join t_user u on t.teacherid=u.userid
+            group by t.teacherid
+        </if>
     </select>
     <!--阅卷进度-按教师-->
     <resultMap id="teacherResultMap" type="java.util.Map">
@@ -134,7 +154,7 @@
     <select id="listPendingBlock" resultType="java.util.Map">
         select pb.blockname,pb.blockorder,pb.bqnum
         ,pc.mblockid,pc.checktype,pc.dispenseway,pc.numtype
-        ,count(distinct psb.mpsbid)*pc.checktype as total_num
+        ,count(distinct psb.mpsbid) as total_num
         ,count(if(psb.firstcime>0 or psb.secondctime>0,psb.mpsbid,null)) as total_checked_num
         ,count(if(psb.firstcime=0 or (pc.checktype=2 and psb.secondctime=0),psb.mpsbid,null)) as total_uncheck_num
         ,count(if((psb.firstcime>0 and psb.firstcid=#{param.handleid}) or (psb.secondctime>0 and psb.secondcid=#{param.handleid}),psb.mpsbid,null)) as my_checked_num
@@ -195,4 +215,28 @@
         order by field(psb.checked,2,1,3),pctt.taskorder
         limit 1
     </select>
+    <!--阅卷进度-按试题-->
+    <resultMap id="questionResultMap" type="java.util.Map">
+        <result property="qorder" column="qorder"/>
+        <result property="qn" column="qn"/>
+        <result property="qscore" column="qscore"/>
+        <result property="mblockid" column="mblockid"/>
+        <result property="mpid" column="mpid"/>
+        <result property="checktype" column="checktype"/>
+        <result property="totalNum" column="total_num"/>
+        <result property="checkedNum" column="checked_num"/>
+        <result property="uncheckedNum" column="uncheck_num"/>
+        <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
+    </resultMap>
+    <select id="listByQuestion" resultMap="questionResultMap">
+        select q.qorder,q.qn,q.qscore,q.mptqid as mblockid,q.mpid,pc.checktype
+        ,count(distinct psq.mpsqid) as total_num
+        ,count(if(psq.firstcime is not null or psq.secondctime is not null,psq.mpsqid,null)) as checked_num
+        ,count(if(psq.firstcime is null or (pc.checktype=2 and psq.secondctime is null),psq.mpsqid,null)) as uncheck_num
+        from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid
+        left join ms_paper_student_question psq on q.mptqid=psq.mptqid and psq.answered=1
+        where q.mpid=#{mpid} and q.ctype in(3,13,14,15)
+        group by q.mptqid
+        order by q.qorder,q.qn
+    </select>
 </mapper>