Merge branch 'test' into dev

王言钊
2 parents 1dc01dce a124a56e
Showing 6 changed files with 26 additions and 43 deletions
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/AudioServiceImpl.java
src/main/resources/templates/page/audio.html
src/main/resources/templates/page/content.html
src/main/resources/templates/page/liveApply.html
src/main/resources/templates/page/video.html
@@ -16,7 +16,6 @@ public class AudioDTO extends ShyAudio implements Serializable {
     private String end_date;
     private Integer page;
     private Integer pageSize;
-    private String video_priority;
     private String orderByClause;
     private String sp_desc;
     private String sp_Id;
@@ -26,13 +25,12 @@ public class AudioDTO extends ShyAudio implements Serializable {
     public AudioDTO() {
     }
-    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) {
+    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) {
         this.video_title = video_title;
         this.start_date = start_date;
         this.end_date = end_date;
         this.page = page;
         this.pageSize = pageSize;
-        this.video_priority = video_priority;
         this.orderByClause = orderByClause;
         this.sp_desc = sp_desc;
         this.sp_Id = sp_Id;
@@ -80,15 +78,6 @@ public class AudioDTO extends ShyAudio implements Serializable {
         this.pageSize = pageSize;
     }
-
-    public String getVideo_priority() {
-        return video_priority;
-    }
-
-    public void setVideo_priority(String video_priority) {
-        this.video_priority = video_priority;
-    }
-
     public String getOrderByClause() {
         return orderByClause;
     }
@@ -137,7 +126,6 @@ public class AudioDTO extends ShyAudio implements Serializable {
                 ", end_date='" + end_date + '\'' +
                 ", page=" + page +
                 ", pageSize=" + pageSize +
-                ", video_priority='" + video_priority + '\'' +
                 ", orderByClause='" + orderByClause + '\'' +
                 ", sp_desc='" + sp_desc + '\'' +
                 ", sp_Id='" + sp_Id + '\'' +
@@ -290,9 +290,6 @@ public class AudioServiceImpl implements AudioService {
         if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
             criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
         }
-        if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
-            criteria.andEqualTo("priority", audioDTO.getVideo_priority());
-        }
         if (CommonUtils.isNotNull(audioDTO.getSpid())) {
             criteria.andEqualTo("spId", audioDTO.getSpid());
         } else if (CommonUtils.isNotEmpty(audioDTO.getSp_Id())) {
@@ -369,9 +366,6 @@ public class AudioServiceImpl implements AudioService {
             criteria2.andEqualTo("state", 2);
             example.or(criteria2);
         }
-        if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
-            criteria.andEqualTo("priority", audioDTO.getVideo_priority());
-        }
         if (CommonUtils.isNotNull(audioDTO.getSpid())) {
             criteria.andEqualTo("spId", audioDTO.getSpid());
         }
@@ -98,7 +98,6 @@
                                                 <option value="1" th:selected="${AudioStatus==1}">已通过</option>
                                                 <option value="2" th:selected="${AudioStatus==2}">已拒绝</option>
                                             </select>
-                                            <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
                                         </div>
                                     </div>
                                 </div>
@@ -424,7 +423,6 @@
             window.location.href = "/audio/excel" + param;
         }
-        var video_priority = "";
         var video_title = "";
         var start_date = "";
         var end_date = "";
@@ -432,10 +430,10 @@
         var count = "";
         var state = "";
         var sp_Id = "";
+        var expand_list_state ="";
         function updateValue() {
-//             	video_priority = $("#video_priority").val();
             video_title = $("#video_titleID").val();
             start_date = $("#start_date").val();
             end_date = $("#end_date").val();
@@ -443,6 +441,7 @@
             sp_Id = $("#sp_Id").val();
             var spId = [[${session.sessionUser.spid}]];
             count = $("#pageSize").val();
+            expand_list_state = $("#forms").attr("expand_list_state");
             if (spId == 0) {
                 sp_desc = $("#sp_desc").val();
             }
@@ -452,8 +451,7 @@
         //全部
         function quanbu() {
             updateValue();
-            var expand_list_state = $("#forms").attr("expand_list_state");
-            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;
+            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;
         }
         //全部待领
@@ -461,27 +459,27 @@
             updateValue();
             if ($.trim(state) == '') state = 0;
             var receive = 0;
-            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;
+            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;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(state) == '') state = 0;
-            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;
+            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;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
-            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;
+            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;
         });
         //查询
         $('#videos_query').click(function () {
-            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;
+            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;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -480,8 +480,10 @@
         var count = "";
         var contentId = "";
         var content_tag = "";
+        var expand_list_state = "";
         function updateValue() {
+            expand_list_state = $("#forms").attr("expand_list_state");
             title = $("#video_titleID").val();
             source = $("#source").val();
             author = $("#author").val();
@@ -500,7 +502,6 @@
         //全部
         function quanbu() {
             updateValue();
-            var expand_list_state = $("#forms").attr("expand_list_state");
             window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
         }
@@ -508,25 +509,25 @@
         $('#daishen').click(function () {
             updateValue();
             var receive_status = 0;
-            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive_status = 1;
-            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive_status = 2;
-            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
         });
         //查询
         $('#videos_query').click(function () {
-            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
+            window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -492,8 +492,10 @@
         var organization = "";
         var shenhe_state = "";
         var count = "";
+        var expand_list_state = "";
         function updateValue() {
+            expand_list_state = $("#forms").attr("expand_list_state");
             liveApply_theme = $("#liveApply_theme").val();
             start_date = $("#start_date").val();
             end_date = $("#end_date").val();
@@ -511,7 +513,6 @@
         function quanbu() {
             updateValue();
             var receive = "";
-            var expand_list_state = $("#forms").attr("expand_list_state");
             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 + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         }
@@ -520,27 +521,27 @@
             updateValue();
             if ($.trim(shenhe_state) == '') shenhe_state = 0;
             var receive = 0;
-            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 + "&page=" + 1 + "&pageSize=" + count;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(shenhe_state) == '') shenhe_state = 0;
-            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 + "&page=" + 1 + "&pageSize=" + count;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询
-            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 + "&page=" + 1 + "&pageSize=" + count;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         });
         //查询
         $('#videos_query').click(function () {
-            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 + "&page=" + 1 + "&pageSize=" + count;
+            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 + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -478,6 +478,7 @@
         var shen_auditor_id = "";
         var contentId = "";
         var video_id = "";
+        var expand_list_state = "";
         function updateValue() {
@@ -489,6 +490,7 @@
             source = $("#source").val();
             var spId = [[${session.sessionUser.spid}]];
             count = $("#pageSize").val();
+            expand_list_state = $("#forms").attr("expand_list_state");
             if (spId == 0) {
                 sp_desc = $("#sp_desc").val();
                 video_user_id = $("#video_user_id").val();
@@ -502,7 +504,6 @@
         //全部
         function quanbu() {
             updateValue();
-            var expand_list_state = $("#forms").attr("expand_list_state");
             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 + "&page=" + 1 + "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
         }
@@ -512,27 +513,27 @@
             updateValue();
             if ($.trim(state) == '') state = 0;
             var receive = 0;
-            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
+            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(state) == '') state = 0;
-            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
+            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive = 1;
             if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
-            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
+            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 + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
         });
         //查询
         $('#videos_query').click(function () {
-            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 + "&page=" + 1 +  "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id;
+            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 + "&page=" + 1 +  "&pageSize=" + count + "&sp_Id=" + sp_Id + "&source=" + source + "&video_user_id=" + video_user_id + "&shen_auditor_id=" + shen_auditor_id + "&contentId=" + contentId + "&video_id=" + video_id + "&expand_list_state=" + expand_list_state;
         });
         /*全选的操作*/
         $('#select_all').click(function () {