venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询大盘优化，兼容重复课程异常问题

Browse Source
This commit is contained in:
limqhz
2021-08-20 23:39:57 +08:00
parent cfab1955e5
commit b68ae0cf55
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
View File

@@ -112,6 +112,7 @@ public class AppVenueLessonController {
course.append("["); course.append("[");
int temp1 = 1; int temp1 = 1;
for (String d : th){ for (String d : th){
//一共显示多少天
if (temp1 != 1){ if (temp1 != 1){
course.append(","); course.append(",");
} }
@@ -120,6 +121,7 @@ public class AppVenueLessonController {
List<VenueLessonStatus> theDay = lessonOrder.stream().filter(x -> d.equals(x.getSearchDate())) List<VenueLessonStatus> theDay = lessonOrder.stream().filter(x -> d.equals(x.getSearchDate()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (theDay != null && theDay.size() > 0){ if (theDay != null && theDay.size() > 0){
// 涉及多少课程的起始时间
int temp2 = 1; int temp2 = 1;
for (String t : lessonTypes){ for (String t : lessonTypes){
if (temp2 != 1){ if (temp2 != 1){
@@ -169,25 +171,37 @@ public class AppVenueLessonController {
private String ForEachCourse(List<VenueLessonStatus> collect) { private String ForEachCourse(List<VenueLessonStatus> collect) {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (VenueLessonStatus v : collect){ sb.append("'");
sb.append("'" + v.getLessonName() + "<br/>"); 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() + "<br/>");
int limitNum = v.getLimitNum(); int limitNum = v.getLimitNum();
if (limitNum <= 0){ if (limitNum <= 0){
sb.append("满额，剩余：0"); sb.append("满额，剩余：0");
sb.append("<br/><marquee>预定人：" + v.getOrderUsers() + "</marquee>"); sb.append("<br/><marquee>预定人：" + orderUser + "</marquee>");
sb.append("#DD4822'"); sb.append("#DD4822");
} else if (v.getSaleNum() > 0){ } else if (v.getSaleNum() > 0){
sb.append("紧张，剩余："+limitNum); sb.append("紧张，剩余："+limitNum);
sb.append("<br/><marquee>预定人：" + v.getOrderUsers() + "</marquee>"); sb.append("<br/><marquee>预定人：" + orderUser + "</marquee>");
sb.append("#yellow'"); sb.append("#yellow");
} else { } else {
sb.append("【可预定，剩余："+limitNum + "】"); sb.append("【可预定，剩余："+limitNum + "】");
if (v.getSaleNum() != 0){ if (v.getSaleNum() != 0){
sb.append("<br/><marquee>预定人：" + v.getOrderUsers() + "</marquee>"); sb.append("<br/><marquee>预定人：" + orderUser + "</marquee>");
} }
sb.append("#2BD5D5'"); sb.append("#2BD5D5");
} }
} sb.append("'");
return sb.toString(); return sb.toString();
} }