周伟鹏 / 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 131 */
132 132 @GetMapping("/page")
133 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 135 Integer shenhe_state,Integer receive, String sp_desc,String orderByClause, HttpSession session) {
136 136 System.out.println("进入直播申请内容页");
137 137 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
... ... @@ -352,16 +352,18 @@ public class LiveApplyController {
352 352 cell = row.createCell(4);//列
353 353 cell.setCellValue("直播主题");
354 354 cell = row.createCell(5);//列
355   - cell.setCellValue("直播申请方");
  355 + cell.setCellValue("spn昵称");
356 356 cell = row.createCell(6);//列
357   - cell.setCellValue("直播类型");
  357 + cell.setCellValue("直播申请方");
358 358 cell = row.createCell(7);//列
359   - cell.setCellValue("直播简介");
  359 + cell.setCellValue("直播类型");
360 360 cell = row.createCell(8);//列
361   - cell.setCellValue("频道_id");
  361 + cell.setCellValue("直播简介");
362 362 cell = row.createCell(9);//列
363   - cell.setCellValue("直播活动id");
  363 + cell.setCellValue("频道_id");
364 364 cell = row.createCell(10);//列
  365 + cell.setCellValue("直播活动id");
  366 + cell = row.createCell(11);//列
365 367 cell.setCellValue("创建时间");
366 368  
367 369 for (int i = 0; i < liveApplyList.size(); i++) {
... ... @@ -393,14 +395,16 @@ public class LiveApplyController {
393 395 cell = row.createCell(5);//列
394 396 cell.setCellValue(sitesService.findspidDescByspid(liveApplyList.get(i).getSp_id()).getName());
395 397 cell = row.createCell(6);//列
396   - cell.setCellValue(liveApplyList.get(i).getLive_type());
  398 + cell.setCellValue(liveApplyList.get(i).getOrganization());
397 399 cell = row.createCell(7);//列
398   - cell.setCellValue(liveApplyList.get(i).getSimple_content());
  400 + cell.setCellValue(liveApplyList.get(i).getLive_type());
399 401 cell = row.createCell(8);//列
400   - cell.setCellValue(liveApplyList.get(i).getChannel_id());
  402 + cell.setCellValue(liveApplyList.get(i).getSimple_content());
401 403 cell = row.createCell(9);//列
402   - cell.setCellValue(liveApplyList.get(i).getActivity_id());
  404 + cell.setCellValue(liveApplyList.get(i).getChannel_id());
403 405 cell = row.createCell(10);//列
  406 + cell.setCellValue(liveApplyList.get(i).getActivity_id());
  407 + cell = row.createCell(11);//列
404 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 112  
113 113 //===============
114 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 116 Integer shenhe_state,Integer receive, String orderByClause, Integer spid, String userId) {
117 117 Example example = new Example(ShyLiveapply.class);
118 118 Example.Criteria criteria = example.createCriteria();
... ... @@ -144,7 +144,7 @@ public class LiveApplyServiceImpl {
144 144 }
145 145  
146 146 if (CommonUtils.isNotNull(business_model)) {
147   - criteria.andEqualTo("business_model", business_model);
  147 + criteria.andLike("organization", "%" + business_model + "%");
148 148 }
149 149 if (CommonUtils.isNotNull(spid)) {
150 150 criteria.andEqualTo("sp_id", spid);
... ...
src/main/resources/templates/page/liveApply.html
  View file @0382849
... ... @@ -60,7 +60,6 @@
60 60 th:onclick="'javascript:quanbu()'" value="" id="quanbu">
61 61 全部
62 62 </button>
63   - </button>
64 63 <button type="button" class="btn btn-sm margin-r-5 filter " id="daishen"
65 64 th:onclick="'javascript:daishen()'" value="0">全部待领
66 65 </button>
... ... @@ -76,19 +75,19 @@
76 75 </button>
77 76 </div>
78 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 79 <div class="col-md-6" style="padding: 0;width: 100%;">
81 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 82 <input class="form-control" type="text" value="" id="liveApply_theme">
84 83 </div>
85 84 </div>
86 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 88 <div class="col-md-5" style="padding: 0;width: 100%;">
90 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 91 <select class="form-control" id="shenhe_state" name="shenhe_state">
93 92 <option value="">全部</option>
94 93 <option value="0">未审核</option>
... ... @@ -98,27 +97,35 @@
98 97 </div>
99 98 </div>
100 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 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 121 <div class="col-md-6" style="padding: 0;width: 100%;" th:if="${session.sessionUser.spid==0}">
115 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 124 <input class="form-control" type="text" value="" id="sp_desc">
118 125 </div>
119 126 </div>
120 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 129 <div class="col-md-12" style="padding: 0;width: 100%;">
123 130 <label for="start_date" class="control-label cb-toolbar">预计时间:</label>
124 131 <div class="input-group col-md-8 date">
... ... @@ -191,22 +198,27 @@
191 198 <div class="th-inner ">sp简称</div>
192 199 <div class="fht-cell"></div>
193 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 202 tabindex="0">
196 203 <div class="th-inner ">直播主题</div>
197 204 <div class="fht-cell"></div>
198 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 207 tabindex="0">
201   - <div class="th-inner ">商务模式</div>
  208 + <div class="th-inner ">发起单位</div>
202 209 <div class="fht-cell"></div>
203 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 216 <th style="text-align: center; width: 3%; " data-field="is_hot_name"
205 217 tabindex="0">
206 218 <div class="th-inner ">直播类型</div>
207 219 <div class="fht-cell"></div>
208 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 222 tabindex="0">
211 223 <div class="th-inner ">审核员</div>
212 224 <div class="fht-cell"></div>
... ... @@ -221,7 +233,7 @@
221 233 <div class="th-inner ">审核类型</div>
222 234 <div class="fht-cell"></div>
223 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 237 tabindex="0">
226 238 <div class="th-inner ">邮件通知</div>
227 239 <div class="fht-cell"></div>
... ... @@ -236,7 +248,7 @@
236 248 <div class="th-inner ">预计开播时间</div>
237 249 <div class="fht-cell"></div>
238 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 252 tabindex="0">
241 253 <div class="th-inner ">操作</div>
242 254 <div class="fht-cell"></div>
... ... @@ -254,9 +266,10 @@
254 266 <span th:text="${liveApply.theme}">邓建国正面PK冯小刚</span>
255 267 </a>
256 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 273 <td style="text-align: center; width: 3%;" th:text="${liveApply.live_type}">直播分类</td>
261 274 <td style="text-align: center; width: 6%;" th:text="${liveApply.updater}">审核员
262 275 </td>
... ...