阅卷分配

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

@@ -177,15 +177,30 @@ public class MsBlockCheckService {
         } else {//双评
             //先从ypMap获取教师指定的mpsbid集合，不够的话从epMap获取教师指定的mpsbid集合；还不够的话从ypMap获取剩余的mpsbid集合，还不够的话从epMap获取剩余的mpsbid集合
             List<Integer> ids1 = ypMap.keySet().stream().filter(s -> teacherid.equals(ypMap.get(s))).collect(Collectors.toList());
-            List<Integer> ids2 = ypMap.keySet().stream().filter(s -> teacherid.equals(epMap.get(s))).collect(Collectors.toList());
+            List<Integer> ids2 = epMap.keySet().stream().filter(s -> teacherid.equals(epMap.get(s))).collect(Collectors.toList());
             int num1 = ids1.size();
             int num2 = ids2.size();
             if (taskNum > num1 + num2) {
                 //从ypMap获取taskNum-num1-num2个值为null的集合
-                List<Integer> ids3 = ypMap.keySet().stream().filter(s -> ypMap.get(s) == null).limit(taskNum - num1 - num2).collect(Collectors.toList());
+                int num3 = taskNum - num1 - num2;
+                //ypMap排除ids2的集合
+                LinkedHashMap<Integer, Integer> ypMap2 = new LinkedHashMap<>(ypMap);
+                ids2.forEach(ypMap2.keySet()::remove);
+                List<Integer> ids3 = ypMap2.keySet().stream().filter(s -> ypMap.get(s) == null).limit(num3).collect(Collectors.toList());
                 for (Integer mpsbid : ids3) {
                     ypMap.put(mpsbid, teacherid);
                 }
+                int num4 = num3 - ids3.size();
+                if (num4 > 0) {
+                    //epMap排除ids1、ids3的集合
+                    LinkedHashMap<Integer, Integer> epMap2 = new LinkedHashMap<>(epMap);
+                    ids1.forEach(epMap2.keySet()::remove);
+                    ids3.forEach(epMap2.keySet()::remove);
+                    List<Integer> ids4 = epMap2.keySet().stream().filter(s -> epMap.get(s) == null).limit(num4).collect(Collectors.toList());
+                    for (Integer mpsbid : ids4) {
+                        epMap.put(mpsbid, teacherid);
+                    }
+                }
             } else if (taskNum < num1) {
                 setYpAndEpMap(ypMap, epMap, taskNum, ids1, ids2);
             } else if (taskNum < num2) {

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

@@ -79,7 +79,7 @@
     <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
         from ms_paper_student_block psb
-        where psb.mblockid=#{mblockid} and psb.checked in(0,1)
+        where psb.mblockid=#{mblockid}
         <if test="numtype!=null and numtype==1">
             and psb.stuanswer is not null and psb.stuanswer!=''
         </if>
@@ -90,7 +90,7 @@
     <select id="listStudentByMpsqId" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         select psq.mpsqid as mpsbid,psq.mptqid as mblockid,psq.checked,psq.firstcid,psq.firstcime,psq.secondcid,psq.secondctime
         from ms_paper_student_question psq
-        where psq.mptqid=#{mblockid} and psq.checked in(0,1)
+        where psq.mptqid=#{mblockid}
         <if test="numtype!=null and numtype==1">
             and psq.stuanswer is not null and psq.stuanswer!=''
         </if>