From 5afe493b813e37b400ef5d5b90c11a6fe79ab221 Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Fri, 5 Mar 2021 10:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E9=A6=86=E9=A2=84=E5=AE=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppVenueLessonController.java  | 74 ++++++++++++++-----
 .../mybatis/mapper/sv/VenueLessonMapper.xml   |  2 +-
 2 files changed, 55 insertions(+), 21 deletions(-)
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 853fb57..cd990c0 100644
--- a/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
+++ b/api/src/main/java/com/sv/netty/controller/AppVenueLessonController.java
@@ -52,20 +52,53 @@ public class AppVenueLessonController {
 
     private String concatResult(List<VenueLessonStatus> lessonOrder) {
         StringBuffer sb = new StringBuffer();
-        sb.append("<html><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><head></head>");
+        sb.append("<html><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />" +
+                "<meta http-equiv=\"refresh\" content=\"10\"/><head>");
+        sb.append("<style type=\"text/css\">");
+        sb.append("table {" +
+                "    border-collapse: collapse;" +
+                "    margin: 0 auto;" +
+                "    text-align: center;" +
+                "}" +
+                "" +
+                "table td," +
+                "table th {" +
+                "    border: 1px solid #cad9ea;" +
+                "    color: #666;" +
+                "    height: 30px;" +
+                "}" +
+                "" +
+                "table tr th {" +
+                "    background-color: #CCE8EB;" +
+                "    width: 100px;" +
+                "}" +
+                "" +
+                "table tr:nth-child(odd) {" +
+                "    background: #fff;" +
+                "}" +
+                "" +
+                ".nl {" +
+                "    text-align: left;" +
+                "}" +
+                "" +
+                "table tr:nth-child(even) {" +
+                "    background: #F5FAFA;" +
+                "}");
+        sb.append("</style>");
+        sb.append("</head>");
         sb.append("<body>");
-        sb.append("<h1 align=\"center\">【" + lessonOrder.get(0).getVenueName() + "】(" +  lessonOrder.get(0).getSearchDate() + ")预订信息一览表" + "<h1>");
-        sb.append("<table width = 100%  bgcolor=\"#FFFFFF\" align=\"center\" border=\"1\">");
-        sb.append("<tr bgcolor=\"#3399ff\" align=\"center\">" +
-//                "<td width = 10% style=\"font-size: 20px;\">场馆</td>" +
-                "<td width = 10% style=\"font-size: 20px;\">课程</td>" +
-//                "<td width = 8% style=\"font-size: 20px;\">日期</td>" +
-                "<td width = 10% style=\"font-size: 20px;\">时间</td>" +
-                "<td width = 4% style=\"font-size: 20px;\">总量</td>" +
-                "<td width = 4% style=\"font-size: 20px;\">预订</td>" +
-                "<td width = 4% style=\"font-size: 20px;\">剩余</td>" +
-                "<td width = 20% style=\"font-size: 20px;\">预约用户</td>" +
-                "<td width = 38% style=\"font-size: 20px;\">说明</td>" +
+        sb.append("<h1 align=\"center\">【" + lessonOrder.get(0).getVenueName() + "】预订信息" + "<h1>");
+        sb.append("<table cellspacing=\"0\" cellpadding=\"0\" width = 100% align=\"center\">");
+        sb.append("<tr align=\"center\">" +
+//                "<td width = 10%>场馆</td>" +
+                "<th width = 10%>课程</th>" +
+                "<th width = 10%>日期</th>" +
+                "<th width = 10%>时间</th>" +
+                "<th width = 6%>总量</th>" +
+                "<th width = 6%>预订</th>" +
+                "<th width = 6%>剩余</th>" +
+                "<th width = 22%>预约用户</th>" +
+                "<th width = 30%>说明</th>" +
                 "</tr>");
 //        boolean firstLine = true;
         for (VenueLessonStatus s : lessonOrder){
@@ -74,14 +107,15 @@ public class AppVenueLessonController {
 //                sb.append( "<td width = 10% rowspan=" + lessonOrder.size() + ">"+ s.getVenueName() + "</td>");
 //                firstLine = false;
 //            }
-            sb.append( "<td width = 10% >"+ s.getLessonName() + "</td>");
-//            sb.append( "<td width = 8% >"+ s.getSearchDate() + "</td>");
+            sb.append( "<td width = 10%>"+ s.getLessonName() + "</td>");
+            sb.append( "<td width = 10%>"+ s.getSearchDate() + "</td>");
             sb.append( "<td width = 10%>"+ s.getStartTime() + "-" + s.getEndTime() + "</td>");
-            sb.append( "<td width = 4%>"+ s.getNum() + "</td>");
-            sb.append( "<td width = 4%>"+ s.getSaleNum() + "</td>");
-            sb.append( "<td width = 4%>"+ s.getLimitNum() + "</td>");
-            sb.append( "<td width = 20%>"+ s.getOrderUsers() + "</td>");
-            sb.append( "<td width = 38%>"+ s.getNote() + "</td>");
+            sb.append( "<td width = 6%>"+ s.getNum() + "</td>");
+            sb.append( "<td width = 6%>"+ s.getSaleNum() + "</td>");
+            sb.append( "<td width = 6%>"+ s.getLimitNum() + "</td>");
+            sb.append( "<td class=\"nl\" width = 22%>"+ s.getOrderUsers() + "</td>");
+            String note = s.getNote().replaceAll("<br data-mce-bogus=\"1\">","").replaceAll("<br>","").replaceAll("<p>", "").replaceAll("</p>", "<br/>");
+            sb.append( "<td class=\"nl\" width = 30%>"+ note + "</td>");
             sb.append("</tr>");
         }
         sb.append("</table></body></html>");
diff --git a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
index 3b6526d..21235c4 100644
--- a/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/VenueLessonMapper.xml
@@ -612,7 +612,7 @@
         a.sale_num as 'saleNum',(a.num-a.sale_num) as 'limitNum',
         IFNULL(t.orderUsers,'暂无预订') as 'orderUsers',a.note
         from sv_venue_lesson a LEFT JOIN
-        (select b.lesson_id,group_concat(d.nickname,'(',d.mobile,')','<![CDATA[ <br/> ]]>') as 'orderUsers'
+        (select b.lesson_id,group_concat(distinct d.nickname,'(',d.mobile,')' SEPARATOR '<![CDATA[ <br/> ]]>') as 'orderUsers'
         from sv_member_lesson_ticket b , sv_member d
         where b.member_id = d.id
         and b.`status` != '2'

场馆	课程	日期	时间	总量	预订	剩余	预约用户	说明
"+ s.getVenueName() + "	"+ s.getLessonName() + "	"+ s.getSearchDate() + "	"+ s.getLessonName() + "	"+ s.getSearchDate() + "	"+ s.getStartTime() + "-" + s.getEndTime() + "	"+ s.getNum() + "	"+ s.getSaleNum() + "	"+ s.getLimitNum() + "	"+ s.getOrderUsers() + "	"+ s.getNote() + "	"+ s.getNum() + "	"+ s.getSaleNum() + "	"+ s.getLimitNum() + "	"+ s.getOrderUsers() + "	"+ note + "