周伟鹏 / cnlive_shenhe · Commits

Commit 0382849875a2d810df9e87fb1bc4cb11bd297d8f

Authored by liwei2917
1 parent 800baa78

修改直播申请审核内容

Inline Side-by-side
Showing 3 changed files with 57 additions and 40 deletions
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @0382849
@@ -131,7 +131,7 @@ public class LiveApplyController { @@ -131,7 +131,7 @@ public class LiveApplyController {
131 */ 131 */
132 @GetMapping("/page") 132 @GetMapping("/page")
133 public Object getListLiveApply(Model model,String start_date,String end_date, 133 public Object getListLiveApply(Model model,String start_date,String end_date,
134 - String theme, Integer business_model, Integer page,Integer pageSize, 134 + String theme, String business_model, Integer page,Integer pageSize,
135 Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session) { 135 Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session) {
136 System.out.println("进入直播申请内容页"); 136 System.out.println("进入直播申请内容页");
137 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 137 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -352,16 +352,18 @@ public class LiveApplyController { @@ -352,16 +352,18 @@ public class LiveApplyController {
352 cell = row.createCell(4);//列 352 cell = row.createCell(4);//列
353 cell.setCellValue("直播主题"); 353 cell.setCellValue("直播主题");
354 cell = row.createCell(5);//列 354 cell = row.createCell(5);//列
355 - cell.setCellValue("直播申请方"); 355 + cell.setCellValue("spn昵称");
356 cell = row.createCell(6);//列 356 cell = row.createCell(6);//列
357 - cell.setCellValue("直播类型"); 357 + cell.setCellValue("直播申请方");
358 cell = row.createCell(7);//列 358 cell = row.createCell(7);//列
359 - cell.setCellValue("直播简介"); 359 + cell.setCellValue("直播类型");
360 cell = row.createCell(8);//列 360 cell = row.createCell(8);//列
361 - cell.setCellValue("频道_id"); 361 + cell.setCellValue("直播简介");
362 cell = row.createCell(9);//列 362 cell = row.createCell(9);//列
363 - cell.setCellValue("直播活动id"); 363 + cell.setCellValue("频道_id");
364 cell = row.createCell(10);//列 364 cell = row.createCell(10);//列
  365 + cell.setCellValue("直播活动id");
  366 + cell = row.createCell(11);//列
365 cell.setCellValue("创建时间"); 367 cell.setCellValue("创建时间");
366 368
367 for (int i = 0; i < liveApplyList.size(); i++) { 369 for (int i = 0; i < liveApplyList.size(); i++) {
@@ -393,14 +395,16 @@ public class LiveApplyController { @@ -393,14 +395,16 @@ public class LiveApplyController {
393 cell = row.createCell(5);//列 395 cell = row.createCell(5);//列
394 cell.setCellValue(sitesService.findspidDescByspid(liveApplyList.get(i).getSp_id()).getName()); 396 cell.setCellValue(sitesService.findspidDescByspid(liveApplyList.get(i).getSp_id()).getName());
395 cell = row.createCell(6);//列 397 cell = row.createCell(6);//列
396 - cell.setCellValue(liveApplyList.get(i).getLive_type()); 398 + cell.setCellValue(liveApplyList.get(i).getOrganization());
397 cell = row.createCell(7);//列 399 cell = row.createCell(7);//列
398 - cell.setCellValue(liveApplyList.get(i).getSimple_content()); 400 + cell.setCellValue(liveApplyList.get(i).getLive_type());
399 cell = row.createCell(8);//列 401 cell = row.createCell(8);//列
400 - cell.setCellValue(liveApplyList.get(i).getChannel_id()); 402 + cell.setCellValue(liveApplyList.get(i).getSimple_content());
401 cell = row.createCell(9);//列 403 cell = row.createCell(9);//列
402 - cell.setCellValue(liveApplyList.get(i).getActivity_id()); 404 + cell.setCellValue(liveApplyList.get(i).getChannel_id());
403 cell = row.createCell(10);//列 405 cell = row.createCell(10);//列
  406 + cell.setCellValue(liveApplyList.get(i).getActivity_id());
  407 + cell = row.createCell(11);//列
404 cell.setCellValue(CommonUtils.formatDate(liveApplyList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm")); 408 cell.setCellValue(CommonUtils.formatDate(liveApplyList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm"));
405 } 409 }
406 410
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @0382849
@@ -112,7 +112,7 @@ public class LiveApplyServiceImpl { @@ -112,7 +112,7 @@ public class LiveApplyServiceImpl {
112 112
113 //=============== 113 //===============
114 public PageInfo<ShyLiveapply> getListLiveApply(String theme, String start_date, String end_date, 114 public PageInfo<ShyLiveapply> getListLiveApply(String theme, String start_date, String end_date,
115 - Integer business_model, Integer page, Integer pageSize, 115 + String business_model, Integer page, Integer pageSize,
116 Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) { 116 Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
117 Example example = new Example(ShyLiveapply.class); 117 Example example = new Example(ShyLiveapply.class);
118 Example.Criteria criteria = example.createCriteria(); 118 Example.Criteria criteria = example.createCriteria();
@@ -144,7 +144,7 @@ public class LiveApplyServiceImpl { @@ -144,7 +144,7 @@ public class LiveApplyServiceImpl {
144 } 144 }
145 145
146 if (CommonUtils.isNotNull(business_model)) { 146 if (CommonUtils.isNotNull(business_model)) {
147 - criteria.andEqualTo("business_model", business_model); 147 + criteria.andLike("organization", "%" + business_model + "%");
148 } 148 }
149 if (CommonUtils.isNotNull(spid)) { 149 if (CommonUtils.isNotNull(spid)) {
150 criteria.andEqualTo("sp_id", spid); 150 criteria.andEqualTo("sp_id", spid);
src/main/resources/templates/page/liveApply.html
  View file @0382849
@@ -60,7 +60,6 @@ @@ -60,7 +60,6 @@
60 th:onclick="'javascript:quanbu()'" value="" id="quanbu"> 60 th:onclick="'javascript:quanbu()'" value="" id="quanbu">
61 全部 61 全部
62 </button> 62 </button>
63 - </button>  
64 <button type="button" class="btn btn-sm margin-r-5 filter " id="daishen" 63 <button type="button" class="btn btn-sm margin-r-5 filter " id="daishen"
65 th:onclick="'javascript:daishen()'" value="0">全部待领 64 th:onclick="'javascript:daishen()'" value="0">全部待领
66 </button> 65 </button>
@@ -76,19 +75,19 @@ @@ -76,19 +75,19 @@
76 </button> 75 </button>
77 </div> 76 </div>
78 <div class="form-horizontal form-group-sm" id="forms" style="display: none;float: left;"> 77 <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: 18%;float: left;"> 78 + <div class="btn-group margin-bottom col-md-6" style="padding: 0;width: 15%;float: left;">
80 <div class="col-md-6" style="padding: 0;width: 100%;"> 79 <div class="col-md-6" style="padding: 0;width: 100%;">
81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label> 80 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
82 - <div class="col-sm-8" style="padding: 0;"> 81 + <div class="col-sm-7" style="padding: 0;">
83 <input class="form-control" type="text" value="" id="liveApply_theme"> 82 <input class="form-control" type="text" value="" id="liveApply_theme">
84 </div> 83 </div>
85 </div> 84 </div>
86 </div> 85 </div>
87 86
88 - <div class="btn-group margin-bottom col-md-6" style="padding-left:10px;width: 13%;float: left;"> 87 + <div class="btn-group margin-bottom col-md-6" style="padding-left:0px;width: 13%;float: left;">
89 <div class="col-md-5" style="padding: 0;width: 100%;"> 88 <div class="col-md-5" style="padding: 0;width: 100%;">
90 <label for="shenhe_state" class="control-label cb-toolbar">状态:</label> 89 <label for="shenhe_state" class="control-label cb-toolbar">状态:</label>
91 - <div class="col-sm-8" style="padding: 0;"> 90 + <div class="col-sm-7" style="padding: 0;">
92 <select class="form-control" id="shenhe_state" name="shenhe_state"> 91 <select class="form-control" id="shenhe_state" name="shenhe_state">
93 <option value="">全部</option> 92 <option value="">全部</option>
94 <option value="0">未审核</option> 93 <option value="0">未审核</option>
@@ -98,27 +97,35 @@ @@ -98,27 +97,35 @@
98 </div> 97 </div>
99 </div> 98 </div>
100 </div> 99 </div>
101 - <div class="btn-group margin-bottom col-md-6" style="padding-left: 10px;width: 13%;float: left;">  
102 - <div class="col-md-5" style="padding: 0;width: 100%;">  
103 - <label for="business_model" class="control-label cb-toolbar">模式:</label>  
104 - <div class="col-sm-8" style="padding: 0;">  
105 - <select class="form-control" id="business_model" name="business_model">  
106 - <option value="">全部</option>  
107 - <option value="0">免费</option>  
108 - <option value="1">收费</option>  
109 - </select>  
110 - </div>  
111 - </div> 100 +<!-- <div class="btn-group margin-bottom col-md-6" style="padding-left: 10px;width: 13%;float: left;"> -->
  101 +<!-- <div class="col-md-5" style="padding: 0;width: 100%;"> -->
  102 +<!-- <label for="business_model" class="control-label cb-toolbar">模式:</label> -->
  103 +<!-- <div class="col-sm-8" style="padding: 0;"> -->
  104 +<!-- <select class="form-control" id="business_model" name="business_model"> -->
  105 +<!-- <option value="">全部</option> -->
  106 +<!-- <option value="0">免费</option> -->
  107 +<!-- <option value="1">收费</option> -->
  108 +<!-- </select> -->
  109 +<!-- </div> -->
  110 +<!-- </div> -->
  111 +<!-- </div> -->
  112 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 15%;float: left;">
  113 + <div class="col-md-5" style="padding: 0;width: 100%;" >
  114 + <label for="business_model" class="control-label cb-toolbar">发起单位:</label>
  115 + <div class="col-sm-7" style="padding: 0;">
  116 + <input class="form-control" type="text" value="" id="business_model" name="business_model">
  117 + </div>
  118 + </div>
112 </div> 119 </div>
113 - <div class="btn-group margin-bottom col-md-6" style="padding-left: 10px;width: 18%;float: left;"> 120 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 15%;float: left;">
114 <div class="col-md-6" style="padding: 0;width: 100%;" th:if="${session.sessionUser.spid==0}"> 121 <div class="col-md-6" style="padding: 0;width: 100%;" th:if="${session.sessionUser.spid==0}">
115 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label> 122 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
116 - <div class="col-sm-8" style="padding: 0;"> 123 + <div class="col-sm-7" style="padding: 0;">
117 <input class="form-control" type="text" value="" id="sp_desc"> 124 <input class="form-control" type="text" value="" id="sp_desc">
118 </div> 125 </div>
119 </div> 126 </div>
120 </div> 127 </div>
121 - <div class="btn-group margin-bottom col-md-6" style="padding-left: 10px;width: 20%;float: left;"> 128 + <div class="btn-group margin-bottom col-md-6" style="padding-left: 0px;width: 20%;float: left;">
122 <div class="col-md-12" style="padding: 0;width: 100%;"> 129 <div class="col-md-12" style="padding: 0;width: 100%;">
123 <label for="start_date" class="control-label cb-toolbar">预计时间:</label> 130 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
124 <div class="input-group col-md-8 date"> 131 <div class="input-group col-md-8 date">
@@ -191,22 +198,27 @@ @@ -191,22 +198,27 @@
191 <div class="th-inner ">sp简称</div> 198 <div class="th-inner ">sp简称</div>
192 <div class="fht-cell"></div> 199 <div class="fht-cell"></div>
193 </th> 200 </th>
194 - <th style="text-align: center; width: 20%; " data-field="video_title" 201 + <th style="text-align: center; width: 18%; " data-field="video_title"
195 tabindex="0"> 202 tabindex="0">
196 <div class="th-inner ">直播主题</div> 203 <div class="th-inner ">直播主题</div>
197 <div class="fht-cell"></div> 204 <div class="fht-cell"></div>
198 </th> 205 </th>
199 - <th style="text-align: center; width: 3%; " data-field="is_hot_name" 206 + <th style="text-align: center; width: 6%; " data-field="sp_id_brief"
200 tabindex="0"> 207 tabindex="0">
201 - <div class="th-inner ">商务模式</div> 208 + <div class="th-inner ">发起单位</div>
202 <div class="fht-cell"></div> 209 <div class="fht-cell"></div>
203 </th> 210 </th>
  211 +<!-- <th style="text-align: center; width: 3%; " data-field="is_hot_name" -->
  212 +<!-- tabindex="0"> -->
  213 +<!-- <div class="th-inner ">商务模式</div> -->
  214 +<!-- <div class="fht-cell"></div> -->
  215 +<!-- </th> -->
204 <th style="text-align: center; width: 3%; " data-field="is_hot_name" 216 <th style="text-align: center; width: 3%; " data-field="is_hot_name"
205 tabindex="0"> 217 tabindex="0">
206 <div class="th-inner ">直播类型</div> 218 <div class="th-inner ">直播类型</div>
207 <div class="fht-cell"></div> 219 <div class="fht-cell"></div>
208 </th> 220 </th>
209 - <th style="text-align: center; width: 6%; " data-field="updater" 221 + <th style="text-align: center; width: 3%; " data-field="updater"
210 tabindex="0"> 222 tabindex="0">
211 <div class="th-inner ">审核员</div> 223 <div class="th-inner ">审核员</div>
212 <div class="fht-cell"></div> 224 <div class="fht-cell"></div>
@@ -221,7 +233,7 @@ @@ -221,7 +233,7 @@
221 <div class="th-inner ">审核类型</div> 233 <div class="th-inner ">审核类型</div>
222 <div class="fht-cell"></div> 234 <div class="fht-cell"></div>
223 </th> 235 </th>
224 - <th style="text-align: center; width: 5%; " data-field="state_name" 236 + <th style="text-align: center; width: 3%; " data-field="state_name"
225 tabindex="0"> 237 tabindex="0">
226 <div class="th-inner ">邮件通知</div> 238 <div class="th-inner ">邮件通知</div>
227 <div class="fht-cell"></div> 239 <div class="fht-cell"></div>
@@ -236,7 +248,7 @@ @@ -236,7 +248,7 @@
236 <div class="th-inner ">预计开播时间</div> 248 <div class="th-inner ">预计开播时间</div>
237 <div class="fht-cell"></div> 249 <div class="fht-cell"></div>
238 </th> 250 </th>
239 - <th style="text-align: center; width: 17%; " data-field="action" 251 + <th style="text-align: center; width: 20%; " data-field="action"
240 tabindex="0"> 252 tabindex="0">
241 <div class="th-inner ">操作</div> 253 <div class="th-inner ">操作</div>
242 <div class="fht-cell"></div> 254 <div class="fht-cell"></div>
@@ -254,9 +266,10 @@ @@ -254,9 +266,10 @@
254 <span th:text="${liveApply.theme}">邓建国正面PK冯小刚</span> 266 <span th:text="${liveApply.theme}">邓建国正面PK冯小刚</span>
255 </a> 267 </a>
256 </td> 268 </td>
257 - <td style="text-align: center; width: 3%;"  
258 - th:text="${liveApply.business_model=='1'?'收费':'免费'}">收费  
259 - </td> 269 + <td style="text-align: center; width: 6%;" th:text="${liveApply.organization}"></td>
  270 +<!-- <td style="text-align: center; width: 3%;" -->
  271 +<!-- th:text="${liveApply.business_model=='1'?'收费':'免费'}">收费 -->
  272 +<!-- </td> -->
260 <td style="text-align: center; width: 3%;" th:text="${liveApply.live_type}">直播分类</td> 273 <td style="text-align: center; width: 3%;" th:text="${liveApply.live_type}">直播分类</td>
261 <td style="text-align: center; width: 6%;" th:text="${liveApply.updater}">审核员 274 <td style="text-align: center; width: 6%;" th:text="${liveApply.updater}">审核员
262 </td> 275 </td>