周伟鹏 / cnlive_shenhe · Commits

Commit a1a7e400fcd47443b85a55d7d30e58e2b98a65ac

Authored by 郑超
1 parent 49e3ad63

update

Inline Side-by-side
Showing 2 changed files with 62 additions and 188 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @a1a7e40
1 1 package com.cnlive.shenhe.controller;
2 2  
3   -import com.cnlive.shenhe.entity.ShyActivity;
4   -import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
5   -import com.cnlive.shenhe.utils.*;
6   -import org.apache.poi.xssf.usermodel.XSSFCell;
7   -import org.apache.poi.xssf.usermodel.XSSFRow;
8   -import org.apache.poi.xssf.usermodel.XSSFSheet;
9   -import org.apache.poi.xssf.usermodel.XSSFWorkbook;
10 3 import com.alibaba.fastjson.JSON;
11 4 import com.alibaba.fastjson.JSONObject;
12 5 import com.cnlive.shenhe.bean.ErrorEnum;
13 6 import com.cnlive.shenhe.bean.ResponseBean;
14 7 import com.cnlive.shenhe.bean.SessionUser;
  8 +import com.cnlive.shenhe.entity.ShyActivity;
15 9 import com.cnlive.shenhe.entity.ShySites;
16 10 import com.cnlive.shenhe.entity.ShyUsers;
17 11 import com.cnlive.shenhe.entity.ShyVideos;
  12 +import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
18 13 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
19 14 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
20 15 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
  16 +import com.cnlive.shenhe.utils.*;
21 17 import com.github.pagehelper.PageInfo;
22   -import org.jsoup.helper.DataUtil;
  18 +import org.apache.poi.xssf.usermodel.XSSFCell;
  19 +import org.apache.poi.xssf.usermodel.XSSFRow;
  20 +import org.apache.poi.xssf.usermodel.XSSFSheet;
  21 +import org.apache.poi.xssf.usermodel.XSSFWorkbook;
23 22 import org.slf4j.Logger;
24 23 import org.slf4j.LoggerFactory;
25 24 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.PostMapping;
32 31 import org.springframework.web.bind.annotation.RequestMapping;
33 32 import org.springframework.web.bind.annotation.ResponseBody;
34 33  
35   -import javax.persistence.criteria.CriteriaBuilder;
36 34 import javax.servlet.ServletOutputStream;
37 35 import javax.servlet.http.HttpServletResponse;
38 36 import javax.servlet.http.HttpSession;
... ... @@ -113,8 +111,6 @@ public class VideosController extends BaseController {
113 111 }
114 112 return new ResponseBean(ErrorEnum.SUCCESS);
115 113 // }
116   -// logger.error("领取逻辑不符，不能审核，Video_id:{}", shyVideos.getVideo_id());
117   -// return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "领取逻辑不符，不能审核");
118 114 }
119 115  
120 116 /**
... ... @@ -151,7 +147,7 @@ public class VideosController extends BaseController {
151 147 if (CommonUtils.isNotNull(shySite)) {
152 148 spid = shySite.getSpid();
153 149 } else {
154   - setmodel_site(model);
  150 + setmodelSite(model);
155 151 return "error.html";
156 152 }
157 153 } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
... ... @@ -173,6 +169,8 @@ public class VideosController extends BaseController {
173 169 }
174 170  
175 171 PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
  172 + //查询查询条件
  173 + List<ShyActivity> activityList = shyActivityImpl.selectAll();
176 174 List<ShyVideos> list = videoPage.getList();
177 175 if (!list.isEmpty()) {
178 176 for (ShyVideos videos : list) {
... ... @@ -197,107 +195,14 @@ public class VideosController extends BaseController {
197 195 if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
198 196 //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱
199 197 String source1 = videos.getSource();
200   -
201   - //如果source1不等于null；直接查询
202 198 if (CommonUtils.isNotEmpty(source1)) {
203   - List<ShyActivity> activityList = shyActivityImpl.selectAll();
204   - model.addAttribute("activityList", activityList);
205   - //遍历集合拿到集合中的每一个对象
206 199 for (ShyActivity activity : activityList) {
207   - //从对象中获取属性值set给videos对象
208 200 if (activity.getId().equals(Integer.valueOf(source1))) {
209 201 videos.setSpid_desc(activity.getActivity());
  202 + break;
210 203 }
211   - break;
212 204 }
213 205 }
214   - //videos.setSpid_desc("童声共济" + "(目击者)");
215   - //} else if ("2".equals(source1)) {
216   - // videos.setSpid_desc("全民健身" + "(目击者)");
217   - //} else if ("3".equals(source1)) {
218   - // videos.setSpid_desc("政府监督" + "(目击者)");
219   - //} else if ("4".equals(source1)) {
220   - // videos.setSpid_desc("美食中国" + "(目击者)");
221   - //} else if ("5".equals(source1)) {
222   - // videos.setSpid_desc("老年大学" + "(目击者)");
223   - //} else if ("6".equals(source1)) {
224   - // videos.setSpid_desc("旅游摄影大赛" + "(目击者)");
225   - //} else if ("7".equals(source1)) {
226   - // videos.setSpid_desc("老年大学公开课" + "(目击者)");
227   - //} else if ("8".equals(source1)) {
228   - // videos.setSpid_desc("甲申同文" + "(目击者)");
229   - //} else if ("9".equals(source1)) {
230   - // videos.setSpid_desc("万人同唱一首歌" + "(目击者)");
231   - //} else if ("10".equals(source1)) {
232   - // videos.setSpid_desc("上太空" + "(目击者)");
233   - //} else if ("11".equals(source1)) {
234   - // videos.setSpid_desc("芳华归来个人" + "(目击者)");
235   - //} else if ("12".equals(source1)) {
236   - // videos.setSpid_desc("芳华归来团体" + "(目击者)");
237   - //} else if ("13".equals(source1)) {
238   - // videos.setSpid_desc("小小表演家" + "(目击者)");
239   - //} else if ("100".equals(source1)) {
240   - // videos.setSpid_desc("追问发布会" + "(目击者)");
241   - //} else if ("14".equals(source1)) {
242   - // videos.setSpid_desc("中国微电影" + "(目击者)");
243   - //} else if ("15".equals(source1)) {
244   - // videos.setSpid_desc("幼儿闯关" + "(目击者)");
245   - //} else if ("16".equals(source1)) {
246   - // videos.setSpid_desc("少儿闯关" + "(目击者)");
247   - //} else if ("101".equals(source1)) {
248   - // videos.setSpid_desc("电商-cms" + "(目击者)");
249   - //} else if ("17".equals(source1)) {
250   - // videos.setSpid_desc("青岛读书" + "(目击者)");
251   - //} else if ("18".equals(source1)) {
252   - // videos.setSpid_desc("红色故事演讲" + "(目击者)");
253   - //} else if ("19".equals(source1)) {
254   - // videos.setSpid_desc("红色诗词朗诵" + "(目击者)");
255   - //} else if ("20".equals(source1)) {
256   - // videos.setSpid_desc("红色短剧展演" + "(目击者)");
257   - //} else if ("21".equals(source1)) {
258   - // videos.setSpid_desc("视频号" + "(目击者)");
259   - //} else if ("29".equals(source1)) {
260   - // videos.setSpid_desc("中国故事上太空" + "(目击者)");
261   - //} else if ("30".equals(source1)) {
262   - // videos.setSpid_desc("绽放夕阳二期" + "(目击者)");
263   - //} else if ("31".equals(source1)) {
264   - // videos.setSpid_desc("绽放夕阳三期" + "(目击者)");
265   - //} else if ("33".equals(source1)) {
266   - // videos.setSpid_desc("万人同唱献给党-独唱" + "(目击者)");
267   - //} else if ("34".equals(source1)) {
268   - // videos.setSpid_desc("万人同唱献给党-合唱" + "(目击者)");
269   - //} else if ("29".equals(source1)) {
270   - // videos.setSpid_desc("我们的声音上太空" + "(目击者)");
271   - //} else if ("35".equals(source1)) {
272   - // videos.setSpid_desc("精英少年作品展示" + "(目击者)");
273   - //} else if ("36".equals(source1)) {
274   - // videos.setSpid_desc("上太空成年" + "(目击者)");
275   - //} else if ("37".equals(source1)) {
276   - // videos.setSpid_desc("中国推介" + "(目击者)");
277   - //} else if ("38".equals(source1)) {
278   - // videos.setSpid_desc("教学成果展" + "(目击者)");
279   - //} else if ("39".equals(source1)) {
280   - // videos.setSpid_desc("绽放夕阳" + "(目击者)");
281   - //} else if ("40".equals(source1)) {
282   - // videos.setSpid_desc("家乡推介" + "(目击者)");
283   - //} else if ("41".equals(source1)) {
284   - // videos.setSpid_desc("老体协-柔力球" + "(目击者)");
285   - //} else if ("42".equals(source1)) {
286   - // videos.setSpid_desc("老体协-健身球操" + "(目击者)");
287   - //} else if ("43".equals(source1)) {
288   - // videos.setSpid_desc("老体协-太极拳" + "(目击者)");
289   - //} else if ("44".equals(source1)) {
290   - // videos.setSpid_desc("老体协-持杖健走" + "(目击者)");
291   - //} else if ("45".equals(source1)) {
292   - // videos.setSpid_desc("老体协-广场舞" + "(目击者)");
293   - //} else if ("46".equals(source1)) {
294   - // videos.setSpid_desc("老体协-健身秧歌（鼓）" + "(目击者)");
295   - //} else if ("47".equals(source1)) {
296   - // videos.setSpid_desc("老体协-综合类" + "(目击者)");
297   - //} else if ("48".equals(source1)) {
298   - // videos.setSpid_desc("少儿吟诵" + "(目击者)");
299   - //} else if ("49".equals(source1)) {
300   - // videos.setSpid_desc("少年先锋" + "(目击者)");
301 206 } else {
302 207 videos.setSpid_desc(shySites.getName() + "(目击者)");
303 208 }
... ... @@ -321,7 +226,8 @@ public class VideosController extends BaseController {
321 226 model.addAttribute("pageSize", pageSize);
322 227 model.addAttribute("videoPage", videoPage);
323 228 model.addAttribute("sp_Id", sp_Id);
324   -
  229 + model.addAttribute("source", source);
  230 + model.addAttribute("activityList", activityList);
325 231 return "page/video.html";
326 232 }
327 233  
... ...
src/main/resources/templates/page/video.html
  View file @a1a7e40
... ... @@ -76,7 +76,8 @@
76 76 </button>
77 77 </div>
78 78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;">
79   - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
  79 + <div class="btn-group margin-bottom col-md-6"
  80 + style="padding: 0;width: 15%;float: left;">
80 81 <div class="col-md-5" style="padding: 0;width: 100%;">
81 82 <label for="video_titleID" class="control-label cb-toolbar">标题:</label>
82 83 <div class="col-sm-9" style="padding: 0;">
... ... @@ -85,7 +86,8 @@
85 86 </div>
86 87 </div>
87 88  
88   - <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 10%;float: left;">
  89 + <div class="btn-group margin-bottom col-md-6"
  90 + style="padding: 0;width: 10%;float: left;">
89 91 <div class="col-md-5" style="padding: 0;width: 100%;">
90 92 <label for="state" class="control-label cb-toolbar">状态:</label>
91 93 <div class="col-sm-8" style="padding: 0;">
... ... @@ -125,70 +127,27 @@
125 127 </div>
126 128 </div>
127 129  
128   - <div class="col-md-6" style="padding: 0;width: 25%;" th:if="${session.sessionUser.spid==0}">
  130 + <div class="col-md-6" style="padding: 0;width: 25%;"
  131 + th:if="${session.sessionUser.spid==0}">
129 132 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
130 133 <div class="col-sm-9" style="padding: 0;">
131 134 <input class="form-control" type="text" value="" id="sp_desc">
132 135 </div>
133 136 </div>
134 137  
  138 + <th:block th:text="${source}"></th:block>
135 139 <div class="col-md-6" style="padding: 0;width: 25%;">
136 140 <label for="state" class="control-label cb-toolbar">分类:</label>
137 141 <div class="col-sm-10" style="padding: 0;">
138 142 <select class="form-control" id="source" name="source">
139   - <option value="" th:selected="selected" >全部</option>
140   - <option th:selected="${activitys.id eq activitys.id }"
  143 + <option value="" th:selected="selected">全部</option>
  144 +
  145 + <option th:selected="${activitys.id eq source}"
141 146 th:each="activitys : ${activityList}"
142   - th:value="${activitys.id}" >
  147 + th:value="${activitys.id}">
143 148 <th:block th:text="${activitys.activity}"></th:block>
144 149 </option>
145 150  
146   -<!-- <option value="moment">朋友圈</option>-->
147   -<!-- <option value="29">我们的声音上太空</option>-->
148   -<!-- <option value="0">上传目击者视频</option>-->
149   -<!-- <option value="1">童声共济视频</option>-->
150   -<!-- <option value="2">全民健身视频</option>-->
151   -<!-- <option value="3">问政监管视频</option>-->
152   -<!-- <option value="4">中国网老年大学视频</option>-->
153   -<!-- <option value="5">美食中国视频</option>-->
154   -<!-- <option value="6">旅游摄影大赛视频</option>-->
155   -<!-- <option value="18">红色故事演讲</option>-->
156   -<!-- <option value="19">红色诗词朗诵</option>-->
157   -<!-- <option value="20">红色短剧展演</option>-->
158   -<!-- <option value="7">全国老年大学公开课评选活动</option>-->
159   -<!-- <option value="8">甲申同文</option>-->
160   -<!-- <option value="9">中国老年大学艺术团万人同唱一首歌</option>-->
161   -<!-- <option value="10">孩子声音上太空视频</option>-->
162   -<!-- <option value="100">追问发布会</option>-->
163   -<!-- <option value="11">芳华归来个人</option>-->
164   -<!-- <option value="12">芳华归来团体</option>-->
165   -<!-- <option value="13">小小表演家</option>-->
166   -<!-- <option value="14">中国微电影</option>-->
167   -<!-- <option value="15">幼儿闯关</option>-->
168   -<!-- <option value="16">少儿闯关</option>-->
169   -<!-- <option value="101">电商-cms</option>-->
170   -<!-- <option value="17">青岛读书</option>-->
171   -<!-- <option value="21">视频号</option>-->
172   -<!-- <option value="29">中国故事上太空</option>-->
173   -<!-- <option value="30">绽放夕阳二期</option>-->
174   -<!-- <option value="31">绽放夕阳三期</option>-->
175   -<!-- <option value="33">万人同唱献给党-独唱</option>-->
176   -<!-- <option value="34">万人同唱献给党-合唱</option>-->
177   -<!-- <option value="35">精英少年作品展示</option>-->
178   -<!-- <option value="36">上太空成年</option>-->
179   -<!-- <option value="37">中国推介</option>-->
180   -<!-- <option value="38">教学成果展</option>-->
181   -<!-- <option value="39">绽放夕阳</option>-->
182   -<!-- <option value="40">家乡推介</option>-->
183   -<!-- <option value="41">老体协-柔力球</option>-->
184   -<!-- <option value="42">老体协-健身球操</option>-->
185   -<!-- <option value="43">老体协-太极拳</option>-->
186   -<!-- <option value="44">老体协-持杖健走</option>-->
187   -<!-- <option value="45">老体协-广场舞</option>-->
188   -<!-- <option value="46">老体协-健身秧歌（鼓）</option>-->
189   -<!-- <option value="47">老体协-综合类</option>-->
190   -<!-- <option value="48">少儿吟诵</option>-->
191   -<!-- <option value="49">少年先锋</option>-->
192 151 </select>
193 152 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
194 153 </div>
... ... @@ -196,21 +155,24 @@
196 155 </div>
197 156 </div>
198 157  
199   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  158 + <div class="col-md-6" style="padding: 0;width: 18%;"
  159 + th:if="${session.sessionUser.spid==0}">
200 160 <label for="video_id" class="control-label cb-toolbar">video_id</label>
201 161 <div class="col-sm-9" style="padding: 0;">
202 162 <input class="form-control" type="text" value="" id="video_id">
203 163 </div>
204 164 </div>
205 165  
206   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  166 + <div class="col-md-6" style="padding: 0;width: 18%;"
  167 + th:if="${session.sessionUser.spid==0}">
207 168 <label for="video_user_id" class="control-label cb-toolbar">sid</label>
208 169 <div class="col-sm-9" style="padding: 0;">
209 170 <input class="form-control" type="text" value="" id="video_user_id">
210 171 </div>
211 172 </div>
212 173  
213   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  174 + <div class="col-md-6" style="padding: 0;width: 18%;"
  175 + th:if="${session.sessionUser.spid==0}">
214 176 <label for="contentId" class="control-label cb-toolbar">内容id:</label>
215 177 <div class="col-sm-9" style="padding: 0;">
216 178 <input class="form-control" type="text" value="" id="contentId">
... ... @@ -218,14 +180,16 @@
218 180 </div>
219 181  
220 182  
221   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  183 + <div class="col-md-6" style="padding: 0;width: 18%;"
  184 + th:if="${session.sessionUser.spid==0}">
222 185 <label for="sp_Id" class="control-label cb-toolbar">sp_Id</label>
223 186 <div class="col-sm-9" style="padding: 0;">
224 187 <input class="form-control" type="text" value="" id="sp_Id">
225 188 </div>
226 189 </div>
227 190  
228   - <div class="col-md-6" style="padding: 0;width: 18%;" th:if="${session.sessionUser.spid==0}">
  191 + <div class="col-md-6" style="padding: 0;width: 18%;"
  192 + th:if="${session.sessionUser.spid==0}">
229 193 <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label>
230 194 <div class="col-sm-9" style="padding: 0;">
231 195 <input class="form-control" type="text" value="" id="shen_auditor_id">
... ... @@ -305,7 +269,7 @@
305 269 type="checkbox" th:value="${video.id}"></td>
306 270 <td style="text-align: center; width: 6%;"
307 271 th:text="${video.spid_desc}"></td>
308   - <td style="text-align: center; width: 20%;" >
  272 + <td style="text-align: center; width: 20%;">
309 273 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
310 274 <span th:text="${video.video_title}">邓建国正面PK冯小刚</span>
311 275 </a>
... ... @@ -325,15 +289,16 @@
325 289 <!-- <span class="btn btn-sm btn-danger" th:if="${video.state==3}">自动审核失败</span> -->
326 290 </td>
327 291 <td style="text-align: center; width: 3%;">
328   - <span th:if="${video.shenhe_type==1}">免审</span>
329   - <span th:if="${video.shenhe_type==2}">机审</span>
330   - <span th:if="${video.shenhe_type==3}">人工审</span>
  292 + <span th:if="${video.shenhe_type==1}">免审</span>
  293 + <span th:if="${video.shenhe_type==2}">机审</span>
  294 + <span th:if="${video.shenhe_type==3}">人工审</span>
331 295 </td>
332 296 <td style="text-align: center; width: 10%;"
333 297 th:text="${#dates.format(video.video_upload_time, 'yyyy-MM-dd HH:mm:ss')}">
334 298 2018-03-07 16:56:20
335 299 </td>
336   - <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">视频上传人的id
  300 + <td style="text-align: center; width: 6%;" th:text="${video.video_user_id}">
  301 + 视频上传人的id
337 302 </td>
338 303 <td style="text-align: center; width: 10%;"
339 304 th:text="${#dates.format(video.created_at, 'yyyy-MM-dd HH:mm:ss')}">
... ... @@ -342,7 +307,10 @@
342 307 <td style="text-align: center; width: 17%;">
343 308 <a class="detail" th:href="@{'/videos/details/?id='+${video.id}}">
344 309 <!--th:if="${ (video.receive==true and session.sessionUser.userId==video.receive_user_id) or (video.state==1 or video.state==2) }"-->
345   - <button class="btn btn-info btn-sm" th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">查看</button>
  310 + <button class="btn btn-info btn-sm"
  311 + th:style="${state1 eq '0' && receive1 eq 'false'} ? 'display: none ' : ' '">
  312 + 查看
  313 + </button>
346 314 </a>
347 315 <span th:if="${video.state==0 and video.receive==0}"> &nbsp;</span>
348 316 <a th:href="@{'javascript:applyReceive('+${video.id}+')'}"
... ... @@ -371,7 +339,7 @@
371 339 <option value="50" th:selected="${pageSize==50}">50</option>
372 340 <option value="100" th:selected="${pageSize==100}">100</option>
373 341 </select>
374   - <span class="pagination-info" >条记录</span>
  342 + <span class="pagination-info">条记录</span>
375 343 </div>
376 344 <div class="pull-right pagination">
377 345 <ul class="pagination" th:if="${videoPage.pages>1}">
... ... @@ -456,8 +424,8 @@
456 424 }
457 425  
458 426 //选择每页数量触发函数
459   - function selectPageSize(){
460   - var pageSize=$("#pageSize").val();
  427 + function selectPageSize() {
  428 + var pageSize = $("#pageSize").val();
461 429 var param = location.search;
462 430 if (param.indexOf("pageSize=") != -1) {
463 431 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
... ... @@ -465,7 +433,7 @@
465 433 var h = "";
466 434 for (var i = 0; i < split.length; i++) {
467 435 var s = split[i];
468   - if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
  436 + if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
469 437 }
470 438 h = h.substring(1, h.length);
471 439 window.location.href = "/videos/page?" + h + "&pageSize=" + pageSize;
... ... @@ -488,11 +456,11 @@
488 456 window.location.href = "/videos/excel" + param;
489 457 }
490 458  
491   - var video_priority ="";
  459 + var video_priority = "";
492 460 var video_title = "";
493   - var start_date ="";
  461 + var start_date = "";
494 462 var end_date = "";
495   - var sp_desc ="";
  463 + var sp_desc = "";
496 464 var count = "";
497 465 var state = "";
498 466 var sp_Id = "";
... ... @@ -503,15 +471,15 @@
503 471 var video_id = "";
504 472  
505 473  
506   - function updateValue(){
  474 + function updateValue() {
507 475 video_title = $("#video_titleID").val();
508 476 start_date = $("#start_date").val();
509 477 end_date = $("#end_date").val();
510 478 state = $("#state").val();
511 479 sp_Id = $("#sp_Id").val();
512 480 source = $("#source").val();
513   - var spId=[[${session.sessionUser.spid}]];
514   - if(spId==0){
  481 + var spId = [[${session.sessionUser.spid}]];
  482 + if (spId == 0) {
515 483 sp_desc = $("#sp_desc").val();
516 484 count = $("#pageSize").val();
517 485 video_user_id = $("#video_user_id").val();
... ... @@ -525,35 +493,35 @@
525 493 //全部
526 494 function quanbu() {
527 495 updateValue();
528   - 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+"&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;
  496 + 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 + "&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;
529 497 }
530 498  
531 499 //全部待领
532 500 $('#daishen').click(function () {
533 501 updateValue();
534   - if($.trim(state) == '') state=0;
  502 + if ($.trim(state) == '') state = 0;
535 503 var receive = 0;
536   - 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+"&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;
  504 + 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 + "&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;
537 505 });
538 506 //我的待审核
539 507 $('#Mydaishen').click(function () {
540 508 updateValue();
541 509 var receive = 1;
542   - if($.trim(state) == '') state=0;
543   - 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+"&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;
  510 + if ($.trim(state) == '') state = 0;
  511 + 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 + "&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;
544 512 });
545 513 //我的已审核
546 514 $('#yishen').click(function () {
547 515 updateValue();
548 516 var receive = 1;
549   - if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
550   - 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+"&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;
  517 + if ($.trim(state) == '') state = 3;//审核状态，3代表通过和拒绝都查询
  518 + 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 + "&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;
551 519 });
552 520  
553 521  
554 522 //查询
555 523 $('#videos_query').click(function () {
556   - 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+"&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;
  524 + 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 + "&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;
557 525 });
558 526 /*全选的操作*/
559 527 $('#select_all').click(function () {
... ...