ting.yin 3 年之前
父節點
當前提交
e949da7657

+ 3 - 3
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

@@ -121,7 +121,7 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
         // 选做题多选做
         if (selectiveStatus != null && SelectiveStatus.MUTI_SELECTIVE.equals(selectiveStatus) && !groups.isEmpty()
                 && !selectiveGroups.isEmpty()) {
-            whereSql.append(" and (select count(distinct ss.group_number) from eb_subjective_score ss where ss.student_id = s.id and e.group_number in (:groupNumbers) and e.group_score = -1 )< :selectiveCount ");
+            whereSql.append(" and (select count(distinct ss.group_number) from eb_subjective_score ss where ss.student_id = s.id and e.group_number in (:groupNumbers) and e.group_score = -1 )< :unSelectiveCount ");
         }
         dataSql.append(whereSql);
         StringBuilder orderSql = new StringBuilder(" order by s.inspect_time desc ");
@@ -168,8 +168,8 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
             }
             dataQuery.setParameter("groupNumbers", groupNumbers);
             if (SelectiveStatus.MUTI_SELECTIVE.equals(selectiveStatus)) {
-                int selectiveCount = selectiveGroups.get(0).getSelectiveCount() + 1;
-                dataQuery.setParameter("selectiveCount", selectiveCount);
+                int unSelectiveCount = selectiveGroups.size() - selectiveGroups.get(0).getSelectiveCount();
+                dataQuery.setParameter("unSelectiveCount", unSelectiveCount);
             }
         }
         return dataQuery;