周伟鹏 / cnlive_shenhe · Commits

Commit 6b6b23479b8fcbf01f10ca14b3c998397ca36137

Authored by 王言钊
2 parents 4be6695b 9e1be589

Merge branch 'test' into dev

Inline Side-by-side
Showing 12 changed files with 24 additions and 18 deletions
src/main/java/com/cnlive/shenhe/controller/AudioController.java
  View file @6b6b234
@@ -144,6 +144,7 @@ public class AudioController extends BaseController { @@ -144,6 +144,7 @@ public class AudioController extends BaseController {
144 model.addAttribute("Sp_id", audioDTO.getSp_Id()); 144 model.addAttribute("Sp_id", audioDTO.getSp_Id());
145 model.addAttribute("Start_date", audioDTO.getStart_date()); 145 model.addAttribute("Start_date", audioDTO.getStart_date());
146 model.addAttribute("End_date", audioDTO.getEnd_date()); 146 model.addAttribute("End_date", audioDTO.getEnd_date());
  147 + model.addAttribute("AudioStatus", audioDTO.getState());
147 return "page/audio.html"; 148 return "page/audio.html";
148 } 149 }
149 150
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
  View file @6b6b234
@@ -132,6 +132,7 @@ public class ChannelController extends BaseController { @@ -132,6 +132,7 @@ public class ChannelController extends BaseController {
132 model.addAttribute("Channel_name", channelDTO.getChannel_name()); 132 model.addAttribute("Channel_name", channelDTO.getChannel_name());
133 model.addAttribute("Start_date", channelDTO.getStart_date()); 133 model.addAttribute("Start_date", channelDTO.getStart_date());
134 model.addAttribute("End_date", channelDTO.getEnd_date()); 134 model.addAttribute("End_date", channelDTO.getEnd_date());
  135 + model.addAttribute("ChannelStatus", channelDTO.getShenhe_status());
135 return "page/channel.html"; 136 return "page/channel.html";
136 } 137 }
137 138
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @6b6b234
@@ -146,6 +146,7 @@ public class CommentsController extends BaseController { @@ -146,6 +146,7 @@ public class CommentsController extends BaseController {
146 model.addAttribute("Content", commentsDTO.getContent()); 146 model.addAttribute("Content", commentsDTO.getContent());
147 model.addAttribute("Start_date", commentsDTO.getStart_date()); 147 model.addAttribute("Start_date", commentsDTO.getStart_date());
148 model.addAttribute("End_date", commentsDTO.getEnd_date()); 148 model.addAttribute("End_date", commentsDTO.getEnd_date());
  149 + model.addAttribute("CommentStatus", commentsDTO.getState());
149 return "page/comment.html"; 150 return "page/comment.html";
150 } 151 }
151 152
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @6b6b234
@@ -173,6 +173,7 @@ public class LiveApplyController extends BaseController { @@ -173,6 +173,7 @@ public class LiveApplyController extends BaseController {
173 model.addAttribute("Sp_desc", liveApplyDTO.getSp_desc()); 173 model.addAttribute("Sp_desc", liveApplyDTO.getSp_desc());
174 model.addAttribute("Start_date", liveApplyDTO.getStart_date()); 174 model.addAttribute("Start_date", liveApplyDTO.getStart_date());
175 model.addAttribute("End_date", liveApplyDTO.getEnd_date()); 175 model.addAttribute("End_date", liveApplyDTO.getEnd_date());
  176 + model.addAttribute("LiveApplyStatus", liveApplyDTO.getShenhe_state());
176 return "page/liveApply.html"; 177 return "page/liveApply.html";
177 } 178 }
178 179
src/main/java/com/cnlive/shenhe/controller/TopicController.java
  View file @6b6b234
@@ -116,6 +116,7 @@ public class TopicController extends BaseController { @@ -116,6 +116,7 @@ public class TopicController extends BaseController {
116 model.addAttribute("Sp_desc", topicDTO.getSp_desc()); 116 model.addAttribute("Sp_desc", topicDTO.getSp_desc());
117 model.addAttribute("Start_date", topicDTO.getStart_date()); 117 model.addAttribute("Start_date", topicDTO.getStart_date());
118 model.addAttribute("End_date", topicDTO.getEnd_date()); 118 model.addAttribute("End_date", topicDTO.getEnd_date());
  119 + model.addAttribute("TopicStatus",topicDTO.getShenhe_status());
119 return "page/topic.html"; 120 return "page/topic.html";
120 } 121 }
121 122
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @6b6b234
@@ -236,6 +236,7 @@ public class VideosController extends BaseController { @@ -236,6 +236,7 @@ public class VideosController extends BaseController {
236 model.addAttribute("ContentId", videosDTO.getContentId()); 236 model.addAttribute("ContentId", videosDTO.getContentId());
237 model.addAttribute("Video_user_id", videosDTO.getVideo_user_id()); 237 model.addAttribute("Video_user_id", videosDTO.getVideo_user_id());
238 model.addAttribute("Shen_auditor_id", videosDTO.getShen_auditor_id()); 238 model.addAttribute("Shen_auditor_id", videosDTO.getShen_auditor_id());
  239 + model.addAttribute("VideoStatus", videosDTO.getState());
239 return "page/video.html"; 240 return "page/video.html";
240 } 241 }
241 242
src/main/resources/templates/page/audio.html
  View file @6b6b234
@@ -93,9 +93,9 @@ @@ -93,9 +93,9 @@
93 <div class="col-sm-8" style="padding: 0;"> 93 <div class="col-sm-8" style="padding: 0;">
94 <select class="form-control" id="state" name="state"> 94 <select class="form-control" id="state" name="state">
95 <option value="">全部</option> 95 <option value="">全部</option>
96 - <option value="0">未审核</option>  
97 - <option value="1">已通过</option>  
98 - <option value="2">已拒绝</option> 96 + <option value="0" th:selected="${AudioStatus==0}">未审核</option>
  97 + <option value="1" th:selected="${AudioStatus==1}">已通过</option>
  98 + <option value="2" th:selected="${AudioStatus==2}">已拒绝</option>
99 </select> 99 </select>
100 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> 100 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
101 </div> 101 </div>
src/main/resources/templates/page/channel.html
  View file @6b6b234
@@ -108,9 +108,9 @@ @@ -108,9 +108,9 @@
108 <select class="form-control col-sm-2" id="shenhe_status" 108 <select class="form-control col-sm-2" id="shenhe_status"
109 name="shenhe_status"> 109 name="shenhe_status">
110 <option value="">全部</option> 110 <option value="">全部</option>
111 - <option value="0">未审核</option>  
112 - <option value="1">已通过</option>  
113 - <option value="2">已拒绝</option> 111 + <option value="0" th:selected="${ChannelStatus==0}">未审核</option>
  112 + <option value="1" th:selected="${ChannelStatus==1}">已通过</option>
  113 + <option value="2" th:selected="${ChannelStatus==2}">已拒绝</option>
114 </select> 114 </select>
115 </div> 115 </div>
116 </div> 116 </div>
src/main/resources/templates/page/comment.html
  View file @6b6b234
@@ -116,9 +116,9 @@ @@ -116,9 +116,9 @@
116 <div class="col-sm-8" style="padding: 0;"> 116 <div class="col-sm-8" style="padding: 0;">
117 <select class="form-control col-sm-2" id="state" name="state"> 117 <select class="form-control col-sm-2" id="state" name="state">
118 <option value="">全部</option> 118 <option value="">全部</option>
119 - <option value="0">未审核</option>  
120 - <option value="1">已通过</option>  
121 - <option value="2">已拒绝</option> 119 + <option value="0" th:selected="${CommentStatus==0}">未审核</option>
  120 + <option value="1" th:selected="${CommentStatus==1}">已通过</option>
  121 + <option value="2" th:selected="${CommentStatus==2}">已拒绝</option>
122 </select> 122 </select>
123 </div> 123 </div>
124 </div> 124 </div>
src/main/resources/templates/page/liveApply.html
  View file @6b6b234
@@ -92,9 +92,9 @@ @@ -92,9 +92,9 @@
92 <div class="col-sm-7" style="padding: 0;"> 92 <div class="col-sm-7" style="padding: 0;">
93 <select class="form-control" id="shenhe_state" name="shenhe_state"> 93 <select class="form-control" id="shenhe_state" name="shenhe_state">
94 <option value="">全部</option> 94 <option value="">全部</option>
95 - <option value="0">未审核</option>  
96 - <option value="1">已通过</option>  
97 - <option value="2">已拒绝</option> 95 + <option value="0" th:selected="${LiveApplyStatus==0}">未审核</option>
  96 + <option value="1" th:selected="${LiveApplyStatus==1}">已通过</option>
  97 + <option value="2" th:selected="${LiveApplyStatus==2}">已拒绝</option>
98 </select> 98 </select>
99 </div> 99 </div>
100 </div> 100 </div>
src/main/resources/templates/page/topic.html
  View file @6b6b234
@@ -102,9 +102,9 @@ @@ -102,9 +102,9 @@
102 <div class="col-sm-7" style="padding: 0;"> 102 <div class="col-sm-7" style="padding: 0;">
103 <select class="form-control" id="shenhe_status" name="shenhe_status"> 103 <select class="form-control" id="shenhe_status" name="shenhe_status">
104 <option value="">全部</option> 104 <option value="">全部</option>
105 - <option value="0">未审核</option>  
106 - <option value="1">已通过</option>  
107 - <option value="2">已拒绝</option> 105 + <option value="0" th:selected="${TopicStatus==0}">未审核</option>
  106 + <option value="1" th:selected="${TopicStatus==1}">已通过</option>
  107 + <option value="2" th:selected="${TopicStatus==2}">已拒绝</option>
108 </select> 108 </select>
109 </div> 109 </div>
110 </div> 110 </div>
src/main/resources/templates/page/video.html
  View file @6b6b234
@@ -93,9 +93,9 @@ @@ -93,9 +93,9 @@
93 <div class="col-sm-8" style="padding: 0;"> 93 <div class="col-sm-8" style="padding: 0;">
94 <select class="form-control" id="state" name="state"> 94 <select class="form-control" id="state" name="state">
95 <option value="">全部</option> 95 <option value="">全部</option>
96 - <option value="0">未审核</option>  
97 - <option value="1">已通过</option>  
98 - <option value="2">已拒绝</option> 96 + <option value="0" th:selected="${VideoStatus==0}">未审核</option>
  97 + <option value="1" th:selected="${VideoStatus==1}"}>已通过</option>
  98 + <option value="2" th:selected="${VideoStatus==2}">已拒绝</option>
99 </select> 99 </select>
100 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> 100 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
101 </div> 101 </div>