Commit 40f40dcda039fc7ae8a73f8c6d5722370a58eb03
1 parent
e717e271
修复音频模块条件搜索下拉列展开
Showing
3 changed files
with
8 additions
and
28 deletions
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
| ... | ... | @@ -16,7 +16,6 @@ public class AudioDTO extends ShyAudio implements Serializable { |
| 16 | 16 | private String end_date; |
| 17 | 17 | private Integer page; |
| 18 | 18 | private Integer pageSize; |
| 19 | - private String video_priority; | |
| 20 | 19 | private String orderByClause; |
| 21 | 20 | private String sp_desc; |
| 22 | 21 | private String sp_Id; |
| ... | ... | @@ -26,13 +25,12 @@ public class AudioDTO extends ShyAudio implements Serializable { |
| 26 | 25 | public AudioDTO() { |
| 27 | 26 | } |
| 28 | 27 | |
| 29 | - public AudioDTO(String video_title, String start_date, String end_date, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer spid, String userId) { | |
| 28 | + public AudioDTO(String video_title, String start_date, String end_date, Integer page, Integer pageSize, String orderByClause, String sp_desc, String sp_Id, Integer spid, String userId) { | |
| 30 | 29 | this.video_title = video_title; |
| 31 | 30 | this.start_date = start_date; |
| 32 | 31 | this.end_date = end_date; |
| 33 | 32 | this.page = page; |
| 34 | 33 | this.pageSize = pageSize; |
| 35 | - this.video_priority = video_priority; | |
| 36 | 34 | this.orderByClause = orderByClause; |
| 37 | 35 | this.sp_desc = sp_desc; |
| 38 | 36 | this.sp_Id = sp_Id; |
| ... | ... | @@ -80,15 +78,6 @@ public class AudioDTO extends ShyAudio implements Serializable { |
| 80 | 78 | this.pageSize = pageSize; |
| 81 | 79 | } |
| 82 | 80 | |
| 83 | - | |
| 84 | - public String getVideo_priority() { | |
| 85 | - return video_priority; | |
| 86 | - } | |
| 87 | - | |
| 88 | - public void setVideo_priority(String video_priority) { | |
| 89 | - this.video_priority = video_priority; | |
| 90 | - } | |
| 91 | - | |
| 92 | 81 | public String getOrderByClause() { |
| 93 | 82 | return orderByClause; |
| 94 | 83 | } |
| ... | ... | @@ -137,7 +126,6 @@ public class AudioDTO extends ShyAudio implements Serializable { |
| 137 | 126 | ", end_date='" + end_date + '\'' + |
| 138 | 127 | ", page=" + page + |
| 139 | 128 | ", pageSize=" + pageSize + |
| 140 | - ", video_priority='" + video_priority + '\'' + | |
| 141 | 129 | ", orderByClause='" + orderByClause + '\'' + |
| 142 | 130 | ", sp_desc='" + sp_desc + '\'' + |
| 143 | 131 | ", sp_Id='" + sp_Id + '\'' + | ... | ... |
src/main/java/com/cnlive/shenhe/service/serviceImpl/AudioServiceImpl.java
| ... | ... | @@ -290,9 +290,6 @@ public class AudioServiceImpl implements AudioService { |
| 290 | 290 | if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) { |
| 291 | 291 | criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%"); |
| 292 | 292 | } |
| 293 | - if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) { | |
| 294 | - criteria.andEqualTo("priority", audioDTO.getVideo_priority()); | |
| 295 | - } | |
| 296 | 293 | if (CommonUtils.isNotNull(audioDTO.getSpid())) { |
| 297 | 294 | criteria.andEqualTo("spId", audioDTO.getSpid()); |
| 298 | 295 | } else if (CommonUtils.isNotEmpty(audioDTO.getSp_Id())) { |
| ... | ... | @@ -369,9 +366,6 @@ public class AudioServiceImpl implements AudioService { |
| 369 | 366 | criteria2.andEqualTo("state", 2); |
| 370 | 367 | example.or(criteria2); |
| 371 | 368 | } |
| 372 | - if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) { | |
| 373 | - criteria.andEqualTo("priority", audioDTO.getVideo_priority()); | |
| 374 | - } | |
| 375 | 369 | if (CommonUtils.isNotNull(audioDTO.getSpid())) { |
| 376 | 370 | criteria.andEqualTo("spId", audioDTO.getSpid()); |
| 377 | 371 | } | ... | ... |
src/main/resources/templates/page/audio.html
| ... | ... | @@ -98,7 +98,6 @@ |
| 98 | 98 | <option value="1" th:selected="${AudioStatus==1}">已通过</option> |
| 99 | 99 | <option value="2" th:selected="${AudioStatus==2}">已拒绝</option> |
| 100 | 100 | </select> |
| 101 | - <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> | |
| 102 | 101 | </div> |
| 103 | 102 | </div> |
| 104 | 103 | </div> |
| ... | ... | @@ -424,7 +423,6 @@ |
| 424 | 423 | window.location.href = "/audio/excel" + param; |
| 425 | 424 | } |
| 426 | 425 | |
| 427 | - var video_priority = ""; | |
| 428 | 426 | var video_title = ""; |
| 429 | 427 | var start_date = ""; |
| 430 | 428 | var end_date = ""; |
| ... | ... | @@ -432,10 +430,10 @@ |
| 432 | 430 | var count = ""; |
| 433 | 431 | var state = ""; |
| 434 | 432 | var sp_Id = ""; |
| 433 | + var expand_list_state =""; | |
| 435 | 434 | |
| 436 | 435 | |
| 437 | 436 | function updateValue() { |
| 438 | -// video_priority = $("#video_priority").val(); | |
| 439 | 437 | video_title = $("#video_titleID").val(); |
| 440 | 438 | start_date = $("#start_date").val(); |
| 441 | 439 | end_date = $("#end_date").val(); |
| ... | ... | @@ -443,6 +441,7 @@ |
| 443 | 441 | sp_Id = $("#sp_Id").val(); |
| 444 | 442 | var spId = [[${session.sessionUser.spid}]]; |
| 445 | 443 | count = $("#pageSize").val(); |
| 444 | + expand_list_state = $("#forms").attr("expand_list_state"); | |
| 446 | 445 | if (spId == 0) { |
| 447 | 446 | sp_desc = $("#sp_desc").val(); |
| 448 | 447 | } |
| ... | ... | @@ -452,8 +451,7 @@ |
| 452 | 451 | //全部 |
| 453 | 452 | function quanbu() { |
| 454 | 453 | updateValue(); |
| 455 | - var expand_list_state = $("#forms").attr("expand_list_state"); | |
| 456 | - window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 454 | + window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 457 | 455 | } |
| 458 | 456 | |
| 459 | 457 | //全部待领 |
| ... | ... | @@ -461,27 +459,27 @@ |
| 461 | 459 | updateValue(); |
| 462 | 460 | if ($.trim(state) == '') state = 0; |
| 463 | 461 | var receive = 0; |
| 464 | - 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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id; | |
| 462 | + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 465 | 463 | }); |
| 466 | 464 | //我的待审核 |
| 467 | 465 | $('#Mydaishen').click(function () { |
| 468 | 466 | updateValue(); |
| 469 | 467 | var receive = 1; |
| 470 | 468 | if ($.trim(state) == '') state = 0; |
| 471 | - 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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id; | |
| 469 | + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 472 | 470 | }); |
| 473 | 471 | //我的已审核 |
| 474 | 472 | $('#yishen').click(function () { |
| 475 | 473 | updateValue(); |
| 476 | 474 | var receive = 1; |
| 477 | 475 | if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询 |
| 478 | - 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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id; | |
| 476 | + window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 479 | 477 | }); |
| 480 | 478 | |
| 481 | 479 | |
| 482 | 480 | //查询 |
| 483 | 481 | $('#videos_query').click(function () { |
| 484 | - window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id; | |
| 482 | + window.location.href = "/audio/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&expand_list_state=" + expand_list_state; | |
| 485 | 483 | }); |
| 486 | 484 | /*全选的操作*/ |
| 487 | 485 | $('#select_all').click(function () { | ... | ... |