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

Skip to content

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

演出日历修改

parent 87ffebda
Hide 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{ ...@@ -99,7 +99,6 @@ public class PerformanceCalendarController extends BaseController{
for(int i = 0;i< dateArray2.length;i++){ for(int i = 0;i< dateArray2.length;i++){
//页面列循环 //页面列循环
for(int j = 0;j<dateArray2[i].length; j++){ for(int j = 0;j<dateArray2[i].length; j++){
String targetDate = dateArray2[i][j]; String targetDate = dateArray2[i][j];
if(DateUtil.format(kylinPerformances.getTimeStart(),DateUtil.Formatter.yyyy_MM_dd).equalsIgnoreCase(targetDate)){ if(DateUtil.format(kylinPerformances.getTimeStart(),DateUtil.Formatter.yyyy_MM_dd).equalsIgnoreCase(targetDate)){
switch (j){ switch (j){
...@@ -178,25 +177,32 @@ public class PerformanceCalendarController extends BaseController{ ...@@ -178,25 +177,32 @@ public class PerformanceCalendarController extends BaseController{
String targetDate = dateArray2[i][j]; String targetDate = dateArray2[i][j];
switch (j){ switch (j){
case 0: case 0:
resp.setMonList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setMonDate(targetDate);
resp.setMonList(new ArrayList<>());
break; break;
case 1: case 1:
resp.setTueList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setTueDate(targetDate);
resp.setTueList(new ArrayList<>());
break; break;
case 2: case 2:
resp.setWedList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setWedDate(targetDate);
resp.setWedList(new ArrayList<>());
break; break;
case 3: case 3:
resp.setThuList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setThuDate(targetDate);
resp.setThuList(new ArrayList<>());
break; break;
case 4: case 4:
resp.setFriList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setFriDate(targetDate);
resp.setFriList(new ArrayList<>());
break; break;
case 5: case 5:
resp.setSatList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setSatDate(targetDate);
resp.setSatList(new ArrayList<>());
break; break;
case 6: case 6:
resp.setSunList(new ArrayList<PerformanceCalendarResp.PerformanceVo>()); resp.setSunDate(targetDate);
resp.setSunList(new ArrayList<>());
break; break;
default: default:
break; 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 @@ ...@@ -40,14 +40,6 @@
</div> </div>
</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"> <table id="bootstrap-table2" class="table table-bordered table-hover">
<thead class=""> <thead class="">
<tr> <tr>
...@@ -84,67 +76,137 @@ ...@@ -84,67 +76,137 @@
<tbody th:each="respBean,respBeanStat:${respDataList}"> <tbody th:each="respBean,respBeanStat:${respDataList}">
<tr> <tr>
<td> <td>
<div th:each="performanceVo:${respBean.monList}"> <div th:text="${respBean.monDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.monList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.monList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.tueList}"> <div th:text="${respBean.tueDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.tueList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.tueList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.wedList}"> <div th:text="${respBean.wedDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.wedList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.wedList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.thuList}"> <div th:text="${respBean.thuDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.thuList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.thuList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.friList}"> <div th:text="${respBean.friDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.friList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.friList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.satList}"> <div th:text="${respBean.satDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.satList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.satList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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>
<td> <td>
<div th:each="performanceVo:${respBean.sunList}"> <div th:text="${respBean.sunDate}"></div>
<ul> <th:block th:if="${#lists.size(respBean.sunList)} gt 0">
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li> <div th:each="performanceVo:${respBean.sunList}">
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li> <ul>
<li><span class="right-at">[[${performanceVo.title}]]</span></li> <li><span class="left-at" th:text="*{performanceVo.cityName}"/></li>
</ul> <li><span class="right-at" th:text="*{performanceVo.timeStart}"/></li>
</div> <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> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -189,9 +251,9 @@ ...@@ -189,9 +251,9 @@
var selectListUrl = ctx + "kylin/performanceCalendar/list"; var selectListUrl = ctx + "kylin/performanceCalendar/list";
function submit(){ function submit(){
debugger; var form = $("#formId");
var queryData = $.common.formToJSON("formId"); form.action = selectListUrl;
$.operate.post(selectListUrl,queryData); form.submit();
} }
$(function() { $(function() {
var options = { 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; ...@@ -15,13 +15,20 @@ import java.util.List;
*/ */
@Data @Data
public class PerformanceCalendarResp { public class PerformanceCalendarResp {
List<PerformanceVo> monList; private String monDate;
List<PerformanceVo> tueList; private List<PerformanceVo> monList;
List<PerformanceVo> wedList; private String tueDate;
List<PerformanceVo> thuList; private List<PerformanceVo> tueList;
List<PerformanceVo> friList; private String wedDate;
List<PerformanceVo> satList; private List<PerformanceVo> wedList;
List<PerformanceVo> sunList; 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{ public static class PerformanceVo{
private String title; 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