周伟鹏 / cnlive_shenhe · Commits

Commit b208fda85c86c0479ad0f2dee33d12507e17af93

Authored by 王言钊
1 parent 130483ab

修复条件查询功能、优化频道直播申请、话题模块条件输入框的数据回填显示及样式

Inline Side-by-side
Showing 7 changed files with 39 additions and 29 deletions
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @b208fda
... ... @@ -129,6 +129,10 @@ public class ChannelController extends BaseController {
129 129 model.addAttribute("state1", state1);
130 130 model.addAttribute("pageSize", channelDTO.getPageSize());
131 131 model.addAttribute("channelPage", channelPage);
  132 + model.addAttribute("Channel_id", channelDTO.getChannel_id());
  133 + model.addAttribute("Channel_name", channelDTO.getChannel_name());
  134 + model.addAttribute("Start_date", channelDTO.getStart_date());
  135 + model.addAttribute("End_date", channelDTO.getEnd_date());
132 136 return "page/channel.html";
133 137 }
134 138  
... ...
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @b208fda
... ... @@ -147,9 +147,6 @@ public class LiveApplyController extends BaseController {
147 147 for (ShyLiveapply liveApply : list) {
148 148 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
149 149 String updater = CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater()) ? "白名单" : liveApply.getUpdater();
150   -
151   -
152   -
153 150 String auditorId = liveApply.getAuditor();
154 151 if (CommonUtils.isNotEmpty(auditorId)) {
155 152 ShyUsers user = new ShyUsers();
... ... @@ -172,6 +169,11 @@ public class LiveApplyController extends BaseController {
172 169 }
173 170 model.addAttribute("liveApplyPage", liveApplyPage);
174 171 model.addAttribute("pageSize", liveApplyDTO.getPageSize());
  172 + model.addAttribute("Theme", liveApplyDTO.getTheme());
  173 + model.addAttribute("Organization", liveApplyDTO.getOrganization());
  174 + model.addAttribute("Sp_desc", liveApplyDTO.getSp_desc());
  175 + model.addAttribute("Start_date", liveApplyDTO.getStart_date());
  176 + model.addAttribute("End_date", liveApplyDTO.getEnd_date());
175 177 return "page/liveApply.html";
176 178 }
177 179  
... ...
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @b208fda
... ... @@ -111,6 +111,11 @@ public class TopicController extends BaseController {
111 111 }
112 112 model.addAttribute("topicPage", topicPage);
113 113 model.addAttribute("pageSize", topicDTO.getPageSize());
  114 + model.addAttribute("Topic_id", topicDTO.getTopic_id());
  115 + model.addAttribute("Topic_name", topicDTO.getTopic_name());
  116 + model.addAttribute("Sp_desc", topicDTO.getSp_desc());
  117 + model.addAttribute("Start_date", topicDTO.getStart_date());
  118 + model.addAttribute("End_date", topicDTO.getEnd_date());
114 119 return "page/topic.html";
115 120 }
116 121  
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @b208fda
... ... @@ -121,8 +121,8 @@ public class LiveApplyServiceImpl {
121 121 criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%");
122 122 }
123 123  
124   - if (CommonUtils.isNotNull(liveApplyDTO.getBusiness_model())) {
125   - criteria.andLike("organization", "%" + liveApplyDTO.getBusiness_model() + "%");
  124 + if (CommonUtils.isNotEmpty(liveApplyDTO.getOrganization())) {
  125 + criteria.andLike("organization", "%" + liveApplyDTO.getOrganization() + "%");
126 126 }
127 127 if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
128 128 criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
... ...
src/main/resources/templates/page/channel.html
  View file @b208fda
... ... @@ -92,15 +92,14 @@
92 92 <label for="channel_id" class="control-label cb-toolbar">频道id:</label>
93 93 <div class="col-sm-8" style="padding: 0;">
94 94 <input class="form-control" name="channel_id" type="text"
95   - id="channel_id">
  95 + id="channel_id" th:value="${Channel_id}">
96 96 </div>
97 97 </div>
98 98 <div class="col-md-4" style="padding: 0">
99 99 <label for="channel_name" class="control-label cb-toolbar">频道名称:</label>
100 100 <div class="col-sm-8" style="padding: 0;">
101 101 <input class="form-control" name="channel_name" type="text"
102   - id="channel_name"
103   - >
  102 + id="channel_name" th:value="${Channel_name}">
104 103 </div>
105 104 </div>
106 105 <div class="col-md-3" style="padding: 0">
... ... @@ -123,7 +122,7 @@
123 122 <label for="start_date" class="control-label cb-toolbar">时间:</label>
124 123 <div class="input-group col-md-9 date">
125 124 <input class="form-control date" name="start_date" type="text"
126   - id="start_date">
  125 + id="start_date" th:value="${Start_date}">
127 126 <span class="input-group-addon">
128 127 <span class="glyphicon glyphicon-calendar"></span>
129 128 </span>
... ... @@ -133,7 +132,7 @@
133 132 <label for="start_date" class="control-label cb-toolbar">至</label>
134 133 <div class="input-group col-md-9 date">
135 134 <input class="form-control date" name="end_date" type="text"
136   - id="end_date">
  135 + id="end_date" th:value="${End_date}">
137 136 <span class="input-group-addon">
138 137 <span class="glyphicon glyphicon-calendar"></span>
139 138 </span>
... ...
src/main/resources/templates/page/liveApply.html
  View file @b208fda
... ... @@ -80,7 +80,7 @@
80 80 <div class="col-md-6" style="padding: 0;width: 100%;">
81 81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
82 82 <div class="col-sm-7" style="padding: 0;">
83   - <input class="form-control" type="text" value="" id="liveApply_theme">
  83 + <input class="form-control" type="text" th:value="${Theme}" value="" id="liveApply_theme">
84 84 </div>
85 85 </div>
86 86 </div>
... ... @@ -114,10 +114,10 @@
114 114 <div class="btn-group margin-bottom col-md-6"
115 115 style="padding-left: 0px;width: 15%;float: left;">
116 116 <div class="col-md-5" style="padding: 0;width: 100%;">
117   - <label for="business_model" class="control-label cb-toolbar">发起单位:</label>
  117 + <label for="organization" class="control-label cb-toolbar">发起单位:</label>
118 118 <div class="col-sm-7" style="padding: 0;">
119   - <input class="form-control" type="text" value="" id="business_model"
120   - name="business_model">
  119 + <input class="form-control" type="text" th:value="${Organization}" value="" id="organization"
  120 + name="organization">
121 121 </div>
122 122 </div>
123 123 </div>
... ... @@ -127,7 +127,7 @@
127 127 th:if="${session.sessionUser.spid==0}">
128 128 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
129 129 <div class="col-sm-7" style="padding: 0;">
130   - <input class="form-control" type="text" value="" id="sp_desc">
  130 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
131 131 </div>
132 132 </div>
133 133 </div>
... ... @@ -137,7 +137,7 @@
137 137 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
138 138 <div class="input-group col-md-8 date">
139 139 <input class="form-control date" name="start_date" type="text"
140   - id="start_date">
  140 + id="start_date" th:value="${Start_date}">
141 141 <span class="input-group-addon">
142 142 <span class="glyphicon glyphicon-calendar"></span>
143 143 </span>
... ... @@ -150,7 +150,7 @@
150 150 <label for="start_date" class="control-label cb-toolbar">至</label>
151 151 <div class="input-group col-md-8 date">
152 152 <input class="form-control date" name="end_date" type="text"
153   - id="end_date">
  153 + id="end_date" th:value="${End_date}">
154 154 <span class="input-group-addon">
155 155 <span class="glyphicon glyphicon-calendar"></span>
156 156 </span>
... ... @@ -485,7 +485,7 @@
485 485 var start_date = "";
486 486 var end_date = "";
487 487 var sp_desc = "";
488   - var business_model = "";
  488 + var organization = "";
489 489 var shenhe_state = "";
490 490 var count = "";
491 491  
... ... @@ -494,7 +494,7 @@
494 494 start_date = $("#start_date").val();
495 495 end_date = $("#end_date").val();
496 496 shenhe_state = $("#shenhe_state").val();
497   - business_model = $("#business_model").val();
  497 + organization = $("#organization").val();
498 498 count = $("#pageSize").val();
499 499 var spId = [[${session.sessionUser.spid}]];
500 500 if (spId == 0) {
... ... @@ -508,7 +508,7 @@
508 508 updateValue();
509 509 var receive = "";
510 510 var expand_list_state = $("#forms").attr("expand_list_state");
511   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
  511 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
512 512 }
513 513  
514 514 //全部待领
... ... @@ -516,27 +516,27 @@
516 516 updateValue();
517 517 if ($.trim(shenhe_state) == '') shenhe_state = 0;
518 518 var receive = 0;
519   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  519 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
520 520 });
521 521 //我的待审核
522 522 $('#Mydaishen').click(function () {
523 523 updateValue();
524 524 var receive = 1;
525 525 if ($.trim(shenhe_state) == '') shenhe_state = 0;
526   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  526 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
527 527 });
528 528 //我的已审核
529 529 $('#yishen').click(function () {
530 530 updateValue();
531 531 var receive = 1;
532 532 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询
533   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  533 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
534 534 });
535 535  
536 536  
537 537 //查询
538 538 $('#videos_query').click(function () {
539   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  539 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
540 540 });
541 541 /*全选的操作*/
542 542 $('#select_all').click(function () {
... ...
src/main/resources/templates/page/topic.html
  View file @b208fda
... ... @@ -89,7 +89,7 @@
89 89 <div class="col-md-6" style="padding: 0;width: 100%;">
90 90 <label for="topicId" class="control-label cb-toolbar">话题id:</label>
91 91 <div class="col-sm-7" style="padding: 0;">
92   - <input class="form-control" type="text" value="" id="topicId"
  92 + <input class="form-control" type="text" th:value="${Topic_id}" value="" id="topicId"
93 93 name="topicId">
94 94 </div>
95 95 </div>
... ... @@ -114,7 +114,7 @@
114 114 <div class="col-md-5" style="padding: 0;width: 100%;">
115 115 <label for="topic_name" class="control-label cb-toolbar">话题标题:</label>
116 116 <div class="col-sm-7" style="padding: 0;">
117   - <input class="form-control" type="text" value="" id="topic_name"
  117 + <input class="form-control" type="text" th:value="${Topic_name}" value="" id="topic_name"
118 118 name="topic_name">
119 119 </div>
120 120 </div>
... ... @@ -125,7 +125,7 @@
125 125 th:if="${session.sessionUser.spid==0}">
126 126 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
127 127 <div class="col-sm-7" style="padding: 0;">
128   - <input class="form-control" type="text" value="" id="sp_desc">
  128 + <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
129 129 </div>
130 130 </div>
131 131 </div>
... ... @@ -135,7 +135,7 @@
135 135 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
136 136 <div class="input-group col-md-8 date">
137 137 <input class="form-control date" name="start_date" type="text"
138   - id="start_date">
  138 + id="start_date" th:value="${Start_date}">
139 139 <span class="input-group-addon">
140 140 <span class="glyphicon glyphicon-calendar"></span>
141 141 </span>
... ... @@ -148,7 +148,7 @@
148 148 <label for="start_date" class="control-label cb-toolbar">至</label>
149 149 <div class="input-group col-md-8 date">
150 150 <input class="form-control date" name="end_date" type="text"
151   - id="end_date">
  151 + id="end_date" th:value="${End_date}">
152 152 <span class="input-group-addon">
153 153 <span class="glyphicon glyphicon-calendar"></span>
154 154 </span>
... ...