Commit a3a81fe57d422bb81895ad813b48d648be0b7ded

Authored by liwei2917
1 parent 757f9bcc

修改查询条件不能用的bug,以及图文审核成功的返回消息

src/main/java/com/cnlive/shenhe/controller/ContentController.java
@@ -149,7 +149,7 @@ public class ContentController { @@ -149,7 +149,7 @@ public class ContentController {
149 public ResponseBean pass(String ids, HttpSession session) { 149 public ResponseBean pass(String ids, HttpSession session) {
150 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 150 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
151 String userId = sessionUser.getUserId(); 151 String userId = sessionUser.getUserId();
152 - boolean success = contentService.updateState(ids,"", CommonConst.AUDIT_SUCCESS, userId); 152 + boolean success = contentService.updateState(ids,"审核通过", CommonConst.AUDIT_SUCCESS, userId);
153 if (success) { 153 if (success) {
154 return new ResponseBean(); 154 return new ResponseBean();
155 } else { 155 } else {
src/main/resources/templates/page/content.html
@@ -362,19 +362,27 @@ @@ -362,19 +362,27 @@
362 window.location.href = "/content/excel" + param; 362 window.location.href = "/content/excel" + param;
363 } 363 }
364 364
365 - var title = $("#video_titleID").val();  
366 - var start_date = $("#start_date").val();  
367 - var end_date = $("#end_date").val();  
368 - var sp_desc = $("#sp_desc").val();  
369 - var count = $("#count").val();  
370 - var spId=[[session.sessionUser.spid]]  
371 - if(spId!=0){  
372 - sp_desc ="";  
373 - count=""; 365 + var title = "";
  366 + var start_date ="";
  367 + var end_date = "";
  368 + var sp_desc ="";
  369 + var count = "";
  370 +
  371 + function updateValue(){
  372 + title = $("#video_titleID").val();
  373 + start_date = $("#start_date").val();
  374 + end_date = $("#end_date").val();
  375 + var spId=[[${session.sessionUser.spid}]];
  376 + if(spId==0){
  377 + sp_desc = $("#sp_desc").val();
  378 + count = $("#count").val();
  379 + }
374 } 380 }
  381 +
375 382
376 //全部 383 //全部
377 function quanbu() { 384 function quanbu() {
  385 + updateValue();
378 386
379 // window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority="; 387 // window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
380 window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc+"&pageSize="+count; 388 window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc+"&pageSize="+count;
@@ -382,6 +390,7 @@ @@ -382,6 +390,7 @@
382 390
383 //全部待领 391 //全部待领
384 $('#daishen').click(function () { 392 $('#daishen').click(function () {
  393 + updateValue();
385 var receive_status = 0; 394 var receive_status = 0;
386 // var title = $("#video_titleID").val(); 395 // var title = $("#video_titleID").val();
387 // var start_date = $("#start_date").val(); 396 // var start_date = $("#start_date").val();
@@ -392,6 +401,7 @@ @@ -392,6 +401,7 @@
392 }); 401 });
393 //我的待审核 402 //我的待审核
394 $('#Mydaishen').click(function () { 403 $('#Mydaishen').click(function () {
  404 + updateValue();
395 var receive_status = 1; 405 var receive_status = 1;
396 // var title = $("#video_titleID").val(); 406 // var title = $("#video_titleID").val();
397 // var start_date = $("#start_date").val(); 407 // var start_date = $("#start_date").val();
@@ -402,6 +412,7 @@ @@ -402,6 +412,7 @@
402 }); 412 });
403 //我的已审核 413 //我的已审核
404 $('#yishen').click(function () { 414 $('#yishen').click(function () {
  415 + updateValue();
405 var receive_status = 2; 416 var receive_status = 2;
406 // var title = $("#video_titleID").val(); 417 // var title = $("#video_titleID").val();
407 // var start_date = $("#start_date").val(); 418 // var start_date = $("#start_date").val();
src/main/resources/templates/page/video.html
@@ -360,26 +360,36 @@ @@ -360,26 +360,36 @@
360 window.location.href = "/videos/excel" + param; 360 window.location.href = "/videos/excel" + param;
361 } 361 }
362 362
363 - var video_priority = $("#video_priority").val();  
364 - var video_title = $("#video_titleID").val();  
365 - var start_date = $("#start_date").val();  
366 - var end_date = $("#end_date").val();  
367 - var sp_desc = $("#sp_desc").val();  
368 - var count = $("#count").val();  
369 - var spId=[[session.sessionUser.spid]]  
370 - if(spId!=0){  
371 - sp_desc ="";  
372 - count=""; 363 + var video_priority ="";
  364 + var video_title = "";
  365 + var start_date ="";
  366 + var end_date = "";
  367 + var sp_desc ="";
  368 + var count = "";
  369 +
  370 + function updateValue(){
  371 + video_priority = $("#video_priority").val();
  372 + video_title = $("#video_titleID").val();
  373 + start_date = $("#start_date").val();
  374 + end_date = $("#end_date").val();
  375 + var spId=[[${session.sessionUser.spid}]];
  376 + if(spId==0){
  377 + sp_desc = $("#sp_desc").val();
  378 + count = $("#count").val();
  379 + }
373 } 380 }
  381 +
374 382
375 //全部 383 //全部
376 function quanbu() { 384 function quanbu() {
  385 + updateValue();
377 // window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority="; 386 // window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
378 window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count; 387 window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
379 } 388 }
380 389
381 //全部待领 390 //全部待领
382 $('#daishen').click(function () { 391 $('#daishen').click(function () {
  392 + updateValue();
383 var state = 0; 393 var state = 0;
384 var receive = 0; 394 var receive = 0;
385 // var video_priority = $("#video_priority").val(); 395 // var video_priority = $("#video_priority").val();
@@ -392,6 +402,7 @@ @@ -392,6 +402,7 @@
392 }); 402 });
393 //我的待审核 403 //我的待审核
394 $('#Mydaishen').click(function () { 404 $('#Mydaishen').click(function () {
  405 + updateValue();
395 var state = 0; 406 var state = 0;
396 var receive = 1; 407 var receive = 1;
397 // var video_priority = $("#video_priority").val(); 408 // var video_priority = $("#video_priority").val();
@@ -404,6 +415,7 @@ @@ -404,6 +415,7 @@
404 }); 415 });
405 //我的已审核 416 //我的已审核
406 $('#yishen').click(function () { 417 $('#yishen').click(function () {
  418 + updateValue();
407 var state = 1; 419 var state = 1;
408 var receive = 1; 420 var receive = 1;
409 // var video_priority = $("#video_priority").val(); 421 // var video_priority = $("#video_priority").val();