修改视频拒绝后的常用意见显示，以及导出的常用意见显示

liwei2917
1 parent 5c9a1dfc
Showing 5 changed files with 67 additions and 47 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/content.html
src/main/resources/templates/page/videoDetail.html
@@ -69,7 +69,7 @@ public class VideosController {
     public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        ShyVideos shyVideos = videosService.selectByPrimaryKey(id);
+//        ShyVideos shyVideos = videosService.selectByPrimaryKey(id);
 //        if (shyVideos.getReceive() && CommonUtils.isNotEmpty(shyVideos.getReceive_user_id()) && userId.equals(shyVideos.getReceive_user_id())) {
             JSONObject result = null;
             try {
@@ -89,7 +89,7 @@ public class VideosController {
                 return new ResponseBean(code, result.getString("msg"));
             }
             state = state == 4 ? 2 : 1;
-            int i = videosService.updateVideo(id, userId,null, state, msg);
+            int i = videosService.updateVideo(id, userId,null,attr_tags, state, msg);
             if (i == 0) {
                 return new ResponseBean(ErrorEnum.ERROR);
             }
@@ -193,6 +193,7 @@ public class VideosController {
         } else if (plat == CommonConst.KS_PLAT) {
             yuming = ks_domain + "/";
         }
+        detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags())?"":detailsContent.getAttr_tags());
         model.addAttribute("images", images);
         model.addAttribute("avsampleImgs", avsampleImgs);
         model.addAttribute("video", detailsContent);
@@ -299,26 +300,29 @@ public class VideosController {
             cell.setCellValue("视频标签");
             cell = row.createCell(5);//列
             cell.setCellValue("审核员");
-            cell = row.createCell(6);//列
-            cell.setCellValue("审核意见");
+            cell = row.createCell(6);//增加一列
+            cell.setCellValue("常用审核意见");
             cell = row.createCell(7);//列
-            cell.setCellValue("状态");
+            cell.setCellValue("审核意见");
             cell = row.createCell(8);//列
-            cell.setCellValue("视频关键字");
+            cell.setCellValue("状态");
             cell = row.createCell(9);//列
-            cell.setCellValue("视频简介");
+            cell.setCellValue("视频关键字");
             cell = row.createCell(10);//列
-            cell.setCellValue("视频id");
+            cell.setCellValue("视频简介");
             cell = row.createCell(11);//列
-            cell.setCellValue("创建时间");
+            cell.setCellValue("视频id");
             cell = row.createCell(12);//列
-            cell.setCellValue("视频上传时间");
+            cell.setCellValue("创建时间");
             cell = row.createCell(13);//列
-            cell.setCellValue("视频时长(秒)");
+            cell.setCellValue("视频上传时间");
             cell = row.createCell(14);//列
-            cell.setCellValue("spid");
+            cell.setCellValue("视频时长(秒)");
             cell = row.createCell(15);//列
+            cell.setCellValue("spid");
+            cell = row.createCell(16);//列
             cell.setCellValue("sp简称");
+            
             for (int i = 0; i < shyVideosList.size(); i++) {
                 row = sheetlist.createRow((short) (i + 1));//行
                 cell = row.createCell(0);//列
@@ -348,9 +352,11 @@ public class VideosController {
                     }
                 }
                 cell.setCellValue(updater);
-                cell = row.createCell(6);//列
-                cell.setCellValue(shyVideosList.get(i).getMsg());
+                cell = row.createCell(6);//列、增加一列
+                cell.setCellValue(shyVideosList.get(i).getAttr_tags());
                 cell = row.createCell(7);//列
+                cell.setCellValue(shyVideosList.get(i).getMsg());
+                cell = row.createCell(8);//列
                 /*状态需要处理成用户可读*/
                 if (shyVideosList.get(i).getState() == 0) {
                     state1 = "未审核";
@@ -360,21 +366,21 @@ public class VideosController {
                     state1 = "审核拒绝";
                 }
                 cell.setCellValue(state1);
-                cell = row.createCell(8);//列
-                cell.setCellValue(shyVideosList.get(i).getVideo_keyword());
                 cell = row.createCell(9);//列
-                cell.setCellValue(shyVideosList.get(i).getVideo_desc());
+                cell.setCellValue(shyVideosList.get(i).getVideo_keyword());
                 cell = row.createCell(10);//列
-                cell.setCellValue(shyVideosList.get(i).getVideo_id());
+                cell.setCellValue(shyVideosList.get(i).getVideo_desc());
                 cell = row.createCell(11);//列
-                cell.setCellValue(CommonUtils.formatDate(shyVideosList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
+                cell.setCellValue(shyVideosList.get(i).getVideo_id());
                 cell = row.createCell(12);//列
-                cell.setCellValue(CommonUtils.formatDate(shyVideosList.get(i).getVideo_upload_time(), "yyyy-MM-dd HH:mm:ss"));
+                cell.setCellValue(CommonUtils.formatDate(shyVideosList.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
                 cell = row.createCell(13);//列
-                cell.setCellValue(shyVideosList.get(i).getDuration());
+                cell.setCellValue(CommonUtils.formatDate(shyVideosList.get(i).getVideo_upload_time(), "yyyy-MM-dd HH:mm:ss"));
                 cell = row.createCell(14);//列
-                cell.setCellValue(shyVideosList.get(i).getSpid());
+                cell.setCellValue(shyVideosList.get(i).getDuration());
                 cell = row.createCell(15);//列
+                cell.setCellValue(shyVideosList.get(i).getSpid());
+                cell = row.createCell(16);//列
                 cell.setCellValue(sitesService.findspidDescByspid(shyVideosList.get(i).getSpid()).getName());
             }
@@ -451,7 +457,7 @@ public class VideosController {
                 showMsg = showMsg + "," + shyVideos.getVideo_title() + " " + result.getString("msg");
                 break;
             }
-            int i = videosService.updateVideo(Integer.parseInt(shyVideoId), userId,null, 2, msg);
+            int i = videosService.updateVideo(Integer.parseInt(shyVideoId), userId,null,"", 2, msg);
             if (i == 0) {
                 showMsg = showMsg + "," + shyVideos.getVideo_title() + " 更新失败";
                 break;
@@ -50,6 +50,10 @@ public class ShyVideos {
     private String video_priority;
     /**
+     * 常用审核意见
+     */
+    private String attr_tags;
+    /**
      * 拒绝理由
      */
     private String msg;
@@ -686,5 +690,14 @@ public class ShyVideos {
 	public void setSpid_desc(String spid_desc) {
 		this.spid_desc = spid_desc;
 	}
+
+	public String getAttr_tags() {
+		return attr_tags;
+	}
+
+	public void setAttr_tags(String attr_tags) {
+		this.attr_tags = attr_tags;
+	}
+	
 }
 \ No newline at end of file
@@ -99,10 +99,11 @@ public class VideosServiceImpl {
         return true;
     }
-    public int updateVideo(Integer id, String auditor_id,String updater, Integer state, String msg) {
+    public int updateVideo(Integer id, String auditor_id,String updater,String attr_tags, Integer state, String msg) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditor_id);
         shyVideos.setState(state);
+        shyVideos.setAttr_tags(attr_tags);
         shyVideos.setMsg(msg);
         shyVideos.setUpdater(updater);
         if(CommonUtils.isNotEmpty(auditor_id)){
@@ -381,14 +382,14 @@ public class VideosServiceImpl {
 				shenheState=CommonConst.AUDIT_SUCCESS;
 			}
 			//修改审核云的视频状态
-			int i = videosService.updateVideo(video.getId(), null,video.getUpdater(), shenheState, video.getMsg());
+			int i = videosService.updateVideo(video.getId(), null,video.getUpdater(),"", shenheState, video.getMsg());
 			if (i != 1) {
                 logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id());
             }
 			return i;
 		} else {
 			video.setMsg("点播视频回调失败，"+video.getMsg());
-			videosService.updateVideo(video.getId(), null,video.getUpdater(), CommonConst.AUDIT_CALLBACK_FAIL, video.getMsg());
+			videosService.updateVideo(video.getId(), null,video.getUpdater(),"", CommonConst.AUDIT_CALLBACK_FAIL, video.getMsg());
 			logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg"));
 		}
@@ -52,15 +52,15 @@
                             <div class="btn-group margin-bottom pull-right">
-                                <button type="button" class="btn  btn-success btn-sm margin-r-5 filter "
-                                        th:onclick="'javascript:daochu()'" value="" id="excel">
-                                    导出excel
-                                </button>
+<!--                                 <button type="button" class="btn  btn-success btn-sm margin-r-5 filter " -->
+<!--                                         th:onclick="'javascript:daochu()'" value="" id="excel"> -->
+<!--                                     导出excel -->
+<!--                                 </button> -->
                                 <button type="button" class="btn  btn-sm margin-r-5 filter "
                                         th:onclick="'javascript:quanbu()'" value="" id="quanbu">
                                     全部
                                 </button>
-                                </button>
+<!--                                 </button> -->
                                 <button type="button" class="btn btn-sm margin-r-5 filter " id="daishen"
                                         th:onclick="'javascript:daishen()'" value="0">全部待领
                                 </button>
@@ -216,7 +216,7 @@
                                             <input data-index="0" name="btSelectItem" type="checkbox" th:value="${content.id}"></td>
                                             <td style="text-align: center; width: 6%;" th:text="${content.sp_desc}"></td>
                                             <td style="text-align: center; width: 20%;" >
-                                            <a class="detail" th:href="@{'/content/details/?id='+${content.id}}">
+                                            <a class="detail" th:href="@{'/content/details/'+${content.id}}">
                                             	<span th:text="${content.title}">邓建国正面PK冯小刚</span>
                                             </a>
                                             </td>
@@ -177,19 +177,19 @@
                                             <div class="col-sm-9">
                                                 <select class="form-control   select2 select2-hidden-accessible"
-                                                        onchange="change()" multiple="" data-placeholder="选择常用审核意见,可多选"
-                                                        name="attr_tags[]" id="attr_tags" style="width: 100%;"
+                                                        onchange="change()" multiple="" data-placeholder="选择常用审核意见，可多选"
+                                                        name="attr_tags[]" id="attr_tags" style="width: 100%;" 
                                                         tabindex="-1" aria-hidden="true">
-                                                    <option value="其他">其他</option>
-                                                    <option value="不符">不符</option>
-                                                    <option value="规范">规范</option>
-                                                    <option value="建议">建议</option>
-                                                    <option value="错字">错字</option>
-                                                    <option value="要求">要求</option>
-                                                    <option value="图片">图片</option>
-                                                    <option value="敏感">敏感</option>
-                                                    <option value="视频">视频</option>
-                                                    <option value="提交">提交</option>
+                                                    <option value="其他" th:selected="${video.attr_tags.indexOf('其他')!=-1}">其他</option>
+                                                    <option value="不符" th:selected="${video.attr_tags.indexOf('不符')!=-1}">不符</option>
+                                                    <option value="规范" th:selected="${video.attr_tags.indexOf('规范')!=-1}">规范</option>
+                                                    <option value="建议" th:selected="${video.attr_tags.indexOf('建议')!=-1}">建议</option>
+                                                    <option value="错字" th:selected="${video.attr_tags.indexOf('错字')!=-1}">错字</option>
+                                                    <option value="要求" th:selected="${video.attr_tags.indexOf('要求')!=-1}">要求</option>
+                                                    <option value="图片" th:selected="${video.attr_tags.indexOf('图片')!=-1}">图片</option>
+                                                    <option value="敏感" th:selected="${video.attr_tags.indexOf('敏感')!=-1}">敏感</option>
+                                                    <option value="视频" th:selected="${video.attr_tags.indexOf('视频')!=-1}">视频</option>
+                                                    <option value="提交" th:selected="${video.attr_tags.indexOf('提交')!=-1}">提交</option>
                                                 </select>
                                             </div>
                                         </div>
@@ -267,7 +267,7 @@
                                 <script th:inline="javascript">
                                     //使常用审核意见回显到下方的备注中
                                     function change() {
-                                        $("#msg").val($("#attr_tags").val());
+//                                         $("#msg").val($("#attr_tags").val());
                                     }
                                     /*拒绝*/
@@ -313,7 +313,7 @@
                                                     id: id,
                                                     activity_id: activity_id,
                                                     state: state,
-                                                    attr_tags: msg,
+                                                    attr_tags: attr_tags+"",
                                                     msg: msg,
                                                     callback: callback
                                                 },
@@ -344,7 +344,7 @@
                                                     id: id,
                                                     activity_id: activity_id,
                                                     state: state,
-                                                    attr_tags: msg,
+                                                    attr_tags: attr_tags+"",
                                                     msg: msg,
                                                     callback: callback
                                                 },