夏文涛 пре 2 година
родитељ
комит
5b16c7feca

+ 3 - 1
src/main/java/com/template/controller/SmartEvaluateStudentController2.java

@@ -188,11 +188,13 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
 
         //region 学生综合评价
         List<Integer> examTypes = new ArrayList<>();
+        List<String> oldExamTypes = st.getExamType() == null ? new ArrayList<>() : Arrays.asList(st.getExamType().split(","));
         for (SmartTermTemplate stt : smartSubjectTemplate.getExamTypes()) {
             examTypes.add(stt.getId());
+            oldExamTypes.add(String.valueOf(stt.getId()));
         }
 
-        List<String> oldExamTypes =Arrays.asList(st.getExamType().split(","));
+        oldExamTypes = oldExamTypes.stream().distinct().collect(Collectors.toList());
 
         List<SmartScore> scores = smartScoreService.querySmartScoresByexs(smartSubjectTemplate.getTermId(), smartSubjectTemplate.getGradeId(), oldExamTypes);
         List<Integer> userIds = scores.stream().map(SmartScore::getUserId).distinct().collect(Collectors.toList());