|
|
@@ -195,8 +195,8 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
|
|
|
queryWrapper1.orderByDesc("id");
|
|
|
PageUtils<SmartEvaluateStudent> list = smartEvaluateStudentService.queryPageSmartEvaluateStudent(currentPage, pageCount, queryWrapper1);
|
|
|
if (list.getList() != null && list.getList().size() > 0) {
|
|
|
- List<Integer> gradeIds = list.getList().stream().map(SmartEvaluateStudent::getGradeId).collect(Collectors.toList());
|
|
|
- List<Integer> termIds = list.getList().stream().map(SmartEvaluateStudent::getTermId).collect(Collectors.toList());
|
|
|
+ List<Integer> gradeIds = list.getList().stream().map(SmartEvaluateStudent::getGradeId).distinct().collect(Collectors.toList());
|
|
|
+ List<Integer> termIds = list.getList().stream().map(SmartEvaluateStudent::getTermId).distinct().collect(Collectors.toList());
|
|
|
List<TemplateRuleVo> templateRules = smartTemplateRuleService.queryTemplateRuleByIds(gradeIds, termIds);
|
|
|
for (SmartEvaluateStudent student : list.getList()) {
|
|
|
List<TemplateRuleVo> ownerRules = templateRules.stream().filter(e -> e.getGradeId().equals(student.getGradeId())
|