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