获取分配总数

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

@@ -22,7 +22,7 @@ public interface MsPaperCheckMapper extends TkMapper<MsPaperCheck> {
     List<Map> listPaperCheck(@Param("mpid") Integer mpid);
 
     //获取试卷分配总数
-    Map getDispenseNum(@Param("mpid") Integer mpid, @Param("mblockid") Integer mblockid);
+    Map getDispenseNum(@Param("mpid") Integer mpid, @Param("mblockid") Integer mblockid,@Param("correcttype") Integer correcttype);
 
     //获取题块分配教师列表
     List<MsPaperCheckTeacher> listTeacherByMBlockId(@Param("mpid") Integer mpid,@Param("mblockid") Integer mblockid);

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

@@ -129,9 +129,6 @@ public class MsPaperCheckService {
             List<MsPaperCheckTeacher> teachers = msPaperCheck.getTeachers();
             if (N_Utils.isListEmpty(teachers)) throw new ServiceException("请选择阅卷教师");
             for (MsPaperCheckTeacher teacher : teachers) {
-                if (!N_Utils.isTrueInteger(teacher.getTasknum())) {
-                    throw new ServiceException("请设置每位教师的阅卷任务数");
-                }
                 teacher.setMpid(mpid);
                 teacher.setMblockid(mblockid);
                 teacher.setCreateid(createid);
@@ -170,7 +167,7 @@ public class MsPaperCheckService {
      **/
     public Map getDispenseNum(Integer mpid, Integer mblockid) {
         MsPaperCheck check = msPaperCheckMapper.findByMBlockId(mpid, mblockid);
-        Map map = msPaperCheckMapper.getDispenseNum(check.getMpid(), mblockid);
+        Map map = msPaperCheckMapper.getDispenseNum(check.getMpid(), mblockid, check.getCorrecttype());
         if (check.getChecktype().equals(2)) {//双评，每个学生的试卷要批阅两次
             map.put("signupnum", N_Utils.obj2Int(map.get("signupnum")) * 2);
             map.put("commitnum", N_Utils.obj2Int(map.get("commitnum")) * 2);

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

@@ -50,8 +50,14 @@
     <!--获取试卷分配总数-->
     <select id="getDispenseNum" resultType="java.util.Map">
         select count(distinct ps.studentid) as signupnum
-        ,count(distinct if(psb.stuanswer is not null and psb.stuanswer!='',psb.mpsbid,null)) as commitnum
-        from ms_paper_student ps left join ms_paper_student_block psb on ps.mpid = psb.mpid and psb.mblockid = #{mblockid}
+        <if test="correcttype!=null and correcttype==3">
+            ,(select count(*) from ms_paper_student_block psb where psb.mpid=#{mpid} and psb.mblockid=#{mblockid} and psb.checked!=0) as commitnum
+        </if>
+        <if test="correcttype!=null and correcttype!=3">
+            ,(select count(*) from ms_paper_student_question psb where psb.mpid=#{mpid} and psb.mptqid=#{mblockid} and psb.checked!=0) as commitnum
+        </if>
+        ,(select count(*) from ms_paper_check_teacher_task t WHERE t.mpid=#{mpid} AND t.mblockid=#{mblockid}) as tasknum
+        from ms_paper_student ps
         where ps.mpid = #{mpid}
     </select>
     <!--获取题块分配教师列表-->