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

王言钊
1 parent 130483ab
Showing 7 changed files with 39 additions and 29 deletions
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
src/main/resources/templates/page/channel.html
src/main/resources/templates/page/liveApply.html
src/main/resources/templates/page/topic.html
@@ -129,6 +129,10 @@ public class ChannelController extends BaseController {
         model.addAttribute("state1", state1);
         model.addAttribute("pageSize", channelDTO.getPageSize());
         model.addAttribute("channelPage", channelPage);
+        model.addAttribute("Channel_id", channelDTO.getChannel_id());
+        model.addAttribute("Channel_name", channelDTO.getChannel_name());
+        model.addAttribute("Start_date", channelDTO.getStart_date());
+        model.addAttribute("End_date", channelDTO.getEnd_date());
         return "page/channel.html";
     }
@@ -147,9 +147,6 @@ public class LiveApplyController extends BaseController {
             for (ShyLiveapply liveApply : list) {
                 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater()) ? "白名单" : liveApply.getUpdater();
-
-
-
                     String auditorId = liveApply.getAuditor();
                     if (CommonUtils.isNotEmpty(auditorId)) {
                         ShyUsers user = new ShyUsers();
@@ -172,6 +169,11 @@ public class LiveApplyController extends BaseController {
         }
         model.addAttribute("liveApplyPage", liveApplyPage);
         model.addAttribute("pageSize", liveApplyDTO.getPageSize());
+        model.addAttribute("Theme", liveApplyDTO.getTheme());
+        model.addAttribute("Organization", liveApplyDTO.getOrganization());
+        model.addAttribute("Sp_desc", liveApplyDTO.getSp_desc());
+        model.addAttribute("Start_date", liveApplyDTO.getStart_date());
+        model.addAttribute("End_date", liveApplyDTO.getEnd_date());
         return "page/liveApply.html";
     }
@@ -111,6 +111,11 @@ public class TopicController extends BaseController {
         }
         model.addAttribute("topicPage", topicPage);
         model.addAttribute("pageSize", topicDTO.getPageSize());
+        model.addAttribute("Topic_id", topicDTO.getTopic_id());
+        model.addAttribute("Topic_name", topicDTO.getTopic_name());
+        model.addAttribute("Sp_desc", topicDTO.getSp_desc());
+        model.addAttribute("Start_date", topicDTO.getStart_date());
+        model.addAttribute("End_date", topicDTO.getEnd_date());
         return "page/topic.html";
     }
@@ -121,8 +121,8 @@ public class LiveApplyServiceImpl {
             criteria.andLike("theme", "%" + liveApplyDTO.getTheme() + "%");
         }
-        if (CommonUtils.isNotNull(liveApplyDTO.getBusiness_model())) {
-            criteria.andLike("organization", "%" + liveApplyDTO.getBusiness_model() + "%");
+        if (CommonUtils.isNotEmpty(liveApplyDTO.getOrganization())) {
+            criteria.andLike("organization", "%" + liveApplyDTO.getOrganization() + "%");
         }
         if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
             criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
@@ -92,15 +92,14 @@
                                             <label for="channel_id" class="control-label cb-toolbar">频道id:</label>
                                             <div class="col-sm-8" style="padding: 0;">
                                                 <input class="form-control" name="channel_id" type="text"
-                                                       id="channel_id">
+                                                       id="channel_id" th:value="${Channel_id}">
                                             </div>
                                         </div>
                                         <div class="col-md-4" style="padding: 0">
                                             <label for="channel_name" class="control-label cb-toolbar">频道名称:</label>
                                             <div class="col-sm-8" style="padding: 0;">
                                                 <input class="form-control" name="channel_name" type="text"
-                                                       id="channel_name"
-                                                >
+                                                       id="channel_name" th:value="${Channel_name}">
                                             </div>
                                         </div>
                                         <div class="col-md-3" style="padding: 0">
@@ -123,7 +122,7 @@
                                                 <label for="start_date" class="control-label cb-toolbar">时间:</label>
                                                 <div class="input-group col-md-9 date">
                                                     <input class="form-control date" name="start_date" type="text"
-                                                           id="start_date">
+                                                           id="start_date" th:value="${Start_date}">
                                                     <span class="input-group-addon">
                                                     <span class="glyphicon glyphicon-calendar"></span>
                                                     </span>
@@ -133,7 +132,7 @@
                                                 <label for="start_date" class="control-label cb-toolbar">至</label>
                                                 <div class="input-group col-md-9 date">
                                                     <input class="form-control date" name="end_date" type="text"
-                                                           id="end_date">
+                                                           id="end_date" th:value="${End_date}">
                                                     <span class="input-group-addon">
 									                <span class="glyphicon glyphicon-calendar"></span>
 									                </span>
@@ -80,7 +80,7 @@
                                     <div class="col-md-6" style="padding: 0;width: 100%;">
                                         <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="liveApply_theme">
+                                            <input class="form-control" type="text" th:value="${Theme}" value="" id="liveApply_theme">
                                         </div>
                                     </div>
                                 </div>
@@ -114,10 +114,10 @@
                                 <div class="btn-group margin-bottom col-md-6"
                                      style="padding-left: 0px;width: 15%;float: left;">
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
-                                        <label for="business_model" class="control-label cb-toolbar">发起单位:</label>
+                                        <label for="organization" class="control-label cb-toolbar">发起单位:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="business_model"
-                                                   name="business_model">
+                                            <input class="form-control" type="text" th:value="${Organization}" value="" id="organization"
+                                                   name="organization">
                                         </div>
                                     </div>
                                 </div>
@@ -127,7 +127,7 @@
                                          th:if="${session.sessionUser.spid==0}">
                                         <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="sp_desc">
+                                            <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
                                         </div>
                                     </div>
                                 </div>
@@ -137,7 +137,7 @@
                                         <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
                                         <div class="input-group col-md-8 date">
                                             <input class="form-control date" name="start_date" type="text"
-                                                   id="start_date">
+                                                   id="start_date" th:value="${Start_date}">
                                             <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
                                                 </span>
@@ -150,7 +150,7 @@
                                         <label for="start_date" class="control-label cb-toolbar">至</label>
                                         <div class="input-group col-md-8 date">
                                             <input class="form-control date" name="end_date" type="text"
-                                                   id="end_date">
+                                                   id="end_date" th:value="${End_date}">
                                             <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
                                                 </span>
@@ -485,7 +485,7 @@
         var start_date = "";
         var end_date = "";
         var sp_desc = "";
-        var business_model = "";
+        var organization = "";
         var shenhe_state = "";
         var count = "";
@@ -494,7 +494,7 @@
             start_date = $("#start_date").val();
             end_date = $("#end_date").val();
             shenhe_state = $("#shenhe_state").val();
-            business_model = $("#business_model").val();
+            organization = $("#organization").val();
             count = $("#pageSize").val();
             var spId = [[${session.sessionUser.spid}]];
             if (spId == 0) {
@@ -508,7 +508,7 @@
             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 + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + 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 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
         }
         //全部待领
@@ -516,27 +516,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 + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&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 + "&pageSize=" + count;
         });
         //我的待审核
         $('#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 + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&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 + "&pageSize=" + count;
         });
         //我的已审核
         $('#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 + "&business_model=" + business_model + "&sp_desc=" + sp_desc + "&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 + "&pageSize=" + count;
         });
         //查询
         $('#videos_query').click(function () {
-            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;
+            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;
         });
         /*全选的操作*/
         $('#select_all').click(function () {
@@ -89,7 +89,7 @@
                                     <div class="col-md-6" style="padding: 0;width: 100%;">
                                         <label for="topicId" class="control-label cb-toolbar">话题id:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="topicId"
+                                            <input class="form-control" type="text" th:value="${Topic_id}" value="" id="topicId"
                                                    name="topicId">
                                         </div>
                                     </div>
@@ -114,7 +114,7 @@
                                     <div class="col-md-5" style="padding: 0;width: 100%;">
                                         <label for="topic_name" class="control-label cb-toolbar">话题标题:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="topic_name"
+                                            <input class="form-control" type="text" th:value="${Topic_name}" value="" id="topic_name"
                                                    name="topic_name">
                                         </div>
                                     </div>
@@ -125,7 +125,7 @@
                                          th:if="${session.sessionUser.spid==0}">
                                         <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
                                         <div class="col-sm-7" style="padding: 0;">
-                                            <input class="form-control" type="text" value="" id="sp_desc">
+                                            <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
                                         </div>
                                     </div>
                                 </div>
@@ -135,7 +135,7 @@
                                         <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
                                         <div class="input-group col-md-8 date">
                                             <input class="form-control date" name="start_date" type="text"
-                                                   id="start_date">
+                                                   id="start_date" th:value="${Start_date}">
                                             <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
                                                 </span>
@@ -148,7 +148,7 @@
                                         <label for="start_date" class="control-label cb-toolbar">至</label>
                                         <div class="input-group col-md-8 date">
                                             <input class="form-control date" name="end_date" type="text"
-                                                   id="end_date">
+                                                   id="end_date" th:value="${End_date}">
                                             <span class="input-group-addon">
                                                 <span class="glyphicon glyphicon-calendar"></span>
                                                 </span>