夏文涛 2 лет назад
Родитель
Сommit
7a35dd67cc

+ 2 - 2
src/main/java/com/template/controller/SmartEvaluateStudentController.java

@@ -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())

+ 1 - 1
src/main/resources/mapper/template/SmartTemplateRuleMapper.xml

@@ -18,7 +18,7 @@
         </foreach>
         and sst.term_id in
         <foreach collection="termIds" item="termId" index="index" open="(" close=")" separator=",">
-            ${gradeId}
+            ${termId}
         </foreach>
         and sst.id = str.template_id and sst.deleted = 0
         where sst.deleted = 0