夏文涛 2 роки тому
батько
коміт
5764f3059d

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

@@ -180,18 +180,20 @@ public class SmartEvaluateStudentController2 implements SmartEvaluateStudentCont
         List<SmartExamtype> examtypes = smartExamtypeService.list(null);
         if (list.getList() != null && list.getList().size() > 0) {
             for (SmartSubjectTemplate data : list.getList()) {
-                List<Integer> names = new ArrayList<>();
+                List<String> names = new ArrayList<>();
                 List<String> examTypes = Arrays.asList(data.getExamType().split(","));
                 if (examtypes != null && examtypes.size() > 0) {
                     for (String examType : examTypes) {
                         Optional<SmartExamtype> oExamtype = examtypes.stream().filter(e -> String.valueOf(e.getId()).equals(examType)).findFirst();
                         if(oExamtype != null && oExamtype.isPresent()){
-                            names.add(oExamtype.get().getId());
+                            names.add(oExamtype.get().getName());
                         }
                     }
                 }
+                if(names != null && names.size() > 0){
+                    data.setExamType(StringUtils.join(names));
+                }
 
-                data.setExamType(StringUtils.join(names));
             }
 
         }