周伟鹏 / cnlive_shenhe · Commits

Commit 57d8fefe38528061e557fe45a0b825ae03b232be

Authored by 徐近程
1 parent d6bff5f6

点播spid搜索update

Inline Side-by-side
Showing 2 changed files with 18 additions and 9 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @57d8fef
... ... @@ -150,14 +150,13 @@ public class VideosServiceImpl {
150 150 criteria.andEqualTo("video_priority", video_priority);
151 151 criteria2.andEqualTo("video_priority", video_priority);
152 152 }
153   - /*if (CommonUtils.isNotEmpty(sp_Id)) {
154   - criteria.andEqualTo("spid", sp_Id);
155   - criteria2.andEqualTo("spid", sp_Id);
156   - }*/
157 153  
158 154 if (CommonUtils.isNotNull(spid)) {
159 155 criteria.andEqualTo("spid", spid);
160 156 criteria2.andEqualTo("spid", spid);
  157 + } else if(CommonUtils.isNotEmpty(sp_Id)) {
  158 + criteria.andEqualTo("spid", sp_Id);
  159 + criteria2.andEqualTo("spid", sp_Id);
161 160 }
162 161  
163 162 if (CommonUtils.isNotNull(receive)) {
... ...
src/main/resources/templates/page/video.html
  View file @57d8fef
... ... @@ -130,6 +130,13 @@
130 130 <input class="form-control" type="text" value="" id="sp_desc">
131 131 </div>
132 132 </div>
  133 +
  134 + <div class="col-md-6" style="padding: 0;width: 25%;" th:if="${session.sessionUser.spid==0}">
  135 + <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
  136 + <div class="col-sm-9" style="padding: 0;">
  137 + <input class="form-control" type="text" value="" id="sp_Id">
  138 + </div>
  139 + </div>
133 140 <!-- <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> -->
134 141 <!-- <label for="count" class="control-label cb-toolbar">每页条数:</label> -->
135 142 <!-- <div class="col-sm-5" style="padding: 0;"> -->
... ... @@ -401,6 +408,8 @@
401 408 var sp_desc ="";
402 409 var count = "";
403 410 var state = "";
  411 + var sp_Id = "";
  412 +
404 413  
405 414 function updateValue(){
406 415 // video_priority = $("#video_priority").val();
... ... @@ -408,6 +417,7 @@
408 417 start_date = $("#start_date").val();
409 418 end_date = $("#end_date").val();
410 419 state = $("#state").val();
  420 + sp_Id = $("#sp_Id").val();
411 421 var spId=[[${session.sessionUser.spid}]];
412 422 if(spId==0){
413 423 sp_desc = $("#sp_desc").val();
... ... @@ -419,7 +429,7 @@
419 429 //全部
420 430 function quanbu() {
421 431 updateValue();
422   - window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
  432 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id;
423 433 }
424 434  
425 435 //全部待领
... ... @@ -427,27 +437,27 @@
427 437 updateValue();
428 438 if($.trim(state) == '') state=0;
429 439 var receive = 0;
430   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
  440 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id;
431 441 });
432 442 //我的待审核
433 443 $('#Mydaishen').click(function () {
434 444 updateValue();
435 445 var receive = 1;
436 446 if($.trim(state) == '') state=0;
437   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
  447 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id;
438 448 });
439 449 //我的已审核
440 450 $('#yishen').click(function () {
441 451 updateValue();
442 452 var receive = 1;
443 453 if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
444   - window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
  454 + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id;
445 455 });
446 456  
447 457  
448 458 //查询
449 459 $('#videos_query').click(function () {
450   - window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
  460 + window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id;
451 461 });
452 462 /*全选的操作*/
453 463 $('#select_all').click(function () {
... ...