Merge branch 'dev'

王言钊
2 parents a6f7b586 dc50e0c3
Showing 1 changed file with 11 additions and 5 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -370,8 +370,12 @@ public class VideosController extends BaseController {
         if (spid == 0) {
             videosDTO.setSpid(null);
         }
-        if (videosDTO.getSp_Id() != null && videosDTO.getSp_Id() != "") {
-            videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
+        if (videosDTO.getSp_Id() != null && !"".equals(videosDTO.getSp_Id())) {
+            try {
+                videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
         }
         List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO);
         String fileName = "点播数据";
@@ -417,9 +421,11 @@ public class VideosController extends BaseController {
             cell = row.createCell(14);//列
             cell.setCellValue("视频时长(秒)");
             cell = row.createCell(15);//列
-            cell.setCellValue("spid");
+            cell.setCellValue("spId");
             cell = row.createCell(16);//列
             cell.setCellValue("sp简称");
+            cell = row.createCell(17);//列
+            cell.setCellValue("视频上传人");
             for (int i = 0; i < shyVideosList.size(); i++) {
                 row = sheetlist.createRow((short) (i + 1));//行
@@ -491,6 +497,8 @@ public class VideosController extends BaseController {
                         cell.setCellValue(shySites.getName());
                     }
                 }
+                cell = row.createCell(17);//列
+                cell.setCellValue(shyVideosList.get(i).getVideo_user_id());
             }
             ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -559,6 +567,4 @@ public class VideosController extends BaseController {
         }
         return responseBean;
     }
-
-
 }