diff --git a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java index 18a300c..d345d7d 100644 --- a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java +++ b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java @@ -112,6 +112,7 @@ public class AppVenueLessonController { course.append("["); int temp1 = 1; for (String d : th){ + //一共显示多少天 if (temp1 != 1){ course.append(","); } @@ -120,6 +121,7 @@ public class AppVenueLessonController { List theDay = lessonOrder.stream().filter(x -> d.equals(x.getSearchDate())) .collect(Collectors.toList()); if (theDay != null && theDay.size() > 0){ + // 涉及多少课程的起始时间 int temp2 = 1; for (String t : lessonTypes){ if (temp2 != 1){ @@ -169,25 +171,37 @@ public class AppVenueLessonController { private String ForEachCourse(List collect) { StringBuffer sb = new StringBuffer(); - for (VenueLessonStatus v : collect){ - sb.append("'" + v.getLessonName() + "
"); + sb.append("'"); + String orderUser = ""; + VenueLessonStatus v = collect.get(0); // 兼容错误 + int temp = 1; + for (VenueLessonStatus t : collect) { + if (!"暂无预订".equals(t.getOrderUsers())) { + if (temp != 1){ + orderUser = orderUser + ","; + } + orderUser = orderUser + t.getOrderUsers(); + } + temp ++; + } + sb.append(v.getLessonName() + "
"); int limitNum = v.getLimitNum(); if (limitNum <= 0){ sb.append("满额,剩余:0"); - sb.append("
预定人:" + v.getOrderUsers() + ""); - sb.append("#DD4822'"); + sb.append("
预定人:" + orderUser + ""); + sb.append("#DD4822"); } else if (v.getSaleNum() > 0){ sb.append("紧张,剩余:"+limitNum); - sb.append("
预定人:" + v.getOrderUsers() + ""); - sb.append("#yellow'"); + sb.append("
预定人:" + orderUser + ""); + sb.append("#yellow"); } else { sb.append("【可预定,剩余:"+limitNum + "】"); if (v.getSaleNum() != 0){ - sb.append("
预定人:" + v.getOrderUsers() + ""); + sb.append("
预定人:" + orderUser + ""); } - sb.append("#2BD5D5'"); + sb.append("#2BD5D5"); } - } + sb.append("'"); return sb.toString(); }