Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -925,7 +925,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -956,7 +956,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -991,7 +991,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -1017,7 +1017,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -1047,7 +1047,7 @@ public class EReportGenerateService {
         gr.setStunum(stunum);
         gr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         gr.setStujson(stujson);
         rclassRankList.add(gr);
     }
@@ -1077,11 +1077,23 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname() + "（" + s.getSchoolrank() + "名）").sorted().collect(Collectors.joining("、"));
+        String stujson = stuJson(list2);
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
 
+    //学生名单
+    private String stuJson(List<ERstudent> list2) {
+        List<Map> students = new ArrayList<>();
+        for (ERstudent rstudent : list2) {
+            Map s = new HashMap();
+            s.put("studentname", rstudent.getStudentname());
+            s.put("schoolrank", rstudent.getSchoolrank());
+            students.add(s);
+        }
+        return JSON.toJSONString(students);
+    }
+
     //学生姓名处理
     private void setStudentName(List<ERstudent> list, Map<Integer, String> userMap) {
         list.forEach(s -> s.setStudentname(userMap.get(s.getStudentid())));