记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit a55e01b1 authored by anjiabin's avatar anjiabin
Browse files
Options

演出日历修改

parent 87ffebda
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 75 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java
View file @ a55e01b1
......@@ -99,7 +99,6 @@ public class PerformanceCalendarController extends BaseController{
for(int i = 0;i< dateArray2.length;i++){
//页面列循环
for(int j = 0;j<dateArray2[i].length; j++){
String targetDate = dateArray2[i][j];
if(DateUtil.format(kylinPerformances.getTimeStart(),DateUtil.Formatter.yyyy_MM_dd).equalsIgnoreCase(targetDate)){
switch (j){
......@@ -178,25 +177,32 @@ public class PerformanceCalendarController extends BaseController{
String targetDate = dateArray2[i][j];
switch (j){
case 0:
resp.setMonList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setMonDate(targetDate);
resp.setMonList(new ArrayList<>());
break;
case 1:
resp.setTueList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setTueDate(targetDate);
resp.setTueList(new ArrayList<>());
break;
case 2:
resp.setWedList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setWedDate(targetDate);
resp.setWedList(new ArrayList<>());
break;
case 3:
resp.setThuList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setThuDate(targetDate);
resp.setThuList(new ArrayList<>());
break;
case 4:
resp.setFriList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setFriDate(targetDate);
resp.setFriList(new ArrayList<>());
break;
case 5:
resp.setSatList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setSatDate(targetDate);
resp.setSatList(new ArrayList<>());
break;
case 6:
resp.setSunList(new ArrayList<PerformanceCalendarResp.PerformanceVo>());
resp.setSunDate(targetDate);
resp.setSunList(new ArrayList<>());
break;
default:
break;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performanceCalendar/performanceCalendar.html
View file @ a55e01b1
......@@ -40,14 +40,6 @@
</div>
</div>
<div class="fixed-table-body">
<div class="fixed-table-loading table table-bordered table-hover open" style="top: 35px; display: none;">
<span class="loading-wrap">
<span class="loading-text" style="font-size: 13px;">正在努力地加载数据中，请稍候</span>
<span class="animation-wrap"><span class="animation-dot"></span></span>
</span>
</div>
<table id="bootstrap-table2" class="table table-bordered table-hover">
<thead class="">
<tr>
......@@ -84,67 +76,137 @@
<tbody th:each="respBean,respBeanStat:${respDataList}">
<tr>
<td>
<div th:text="${respBean.monDate}"></div>
<th:block th:if="${#lists.size(respBean.monList)} gt 0">
<div th:each="performanceVo:${respBean.monList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.monList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.tueDate}"></div>
<th:block th:if="${#lists.size(respBean.tueList)} gt 0">
<div th:each="performanceVo:${respBean.tueList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.tueList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.wedDate}"></div>
<th:block th:if="${#lists.size(respBean.wedList)} gt 0">
<div th:each="performanceVo:${respBean.wedList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.wedList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.thuDate}"></div>
<th:block th:if="${#lists.size(respBean.thuList)} gt 0">
<div th:each="performanceVo:${respBean.thuList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.thuList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.friDate}"></div>
<th:block th:if="${#lists.size(respBean.friList)} gt 0">
<div th:each="performanceVo:${respBean.friList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.friList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.satDate}"></div>
<th:block th:if="${#lists.size(respBean.satList)} gt 0">
<div th:each="performanceVo:${respBean.satList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.satList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
<td>
<div th:text="${respBean.sunDate}"></div>
<th:block th:if="${#lists.size(respBean.sunList)} gt 0">
<div th:each="performanceVo:${respBean.sunList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
<li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
<li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
<li><span class="right-at" th:text="*{performanceVo.title}"/>222</li>
</ul>
</div>
</th:block>
<th:block th:if="${#lists.size(respBean.sunList)} eq 0">
<div>
<ul>
<li><span class="left-at" th:text="无演出"/></li>
</ul>
</div>
</th:block>
</td>
</tr>
</tbody>
......@@ -189,9 +251,9 @@
var selectListUrl = ctx + "kylin/performanceCalendar/list";
function submit(){
debugger;
var queryData = $.common.formToJSON("formId");
$.operate.post(selectListUrl,queryData);
var form = $("#formId");
form.action = selectListUrl;
form.submit();
}
$(function() {
var options = {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/PerformanceCalendarResp.java
View file @ a55e01b1
......@@ -15,13 +15,20 @@ import java.util.List;
*/
@Data
public class PerformanceCalendarResp {
List<PerformanceVo> monList;
List<PerformanceVo> tueList;
List<PerformanceVo> wedList;
List<PerformanceVo> thuList;
List<PerformanceVo> friList;
List<PerformanceVo> satList;
List<PerformanceVo> sunList;
private String monDate;
private List<PerformanceVo> monList;
private String tueDate;
private List<PerformanceVo> tueList;
private String wedDate;
private List<PerformanceVo> wedList;
private String thuDate;
private List<PerformanceVo> thuList;
private String friDate;
private List<PerformanceVo> friList;
private String satDate;
private List<PerformanceVo> satList;
private String sunDate;
private List<PerformanceVo> sunList;
public static class PerformanceVo{
private String title;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment