Merge branch 'dev'

陈浩
2 parents 00409a74 d9a4f319
Showing 1 changed file with 4 additions and 0 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -299,6 +299,8 @@ public class VideosController {
             cell.setCellValue("视频时长(秒)");
             cell = row.createCell(14);//列
             cell.setCellValue("spid");
+            cell = row.createCell(15);//列
+            cell.setCellValue("sp简称");
             for (int i = 0; i < shyVideosList.size(); i++) {
                 row = sheetlist.createRow((short) (i + 1));//行
                 cell = row.createCell(0);//列
@@ -354,6 +356,8 @@ public class VideosController {
                 cell.setCellValue(shyVideosList.get(i).getDuration());
                 cell = row.createCell(14);//列
                 cell.setCellValue(shyVideosList.get(i).getSpid());
+                cell = row.createCell(15);//列
+                cell.setCellValue(sitesService.findspidDescByspid(shyVideosList.get(i).getSpid()).getName());
             }
             ByteArrayOutputStream os = new ByteArrayOutputStream();