sadsad

src/main/java/com/template/controller/SmartEvaluateStudentController2.java

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