周伟鹏 / cnlive_shenhe · Commits

Commit 8f2d77e4674a5f36cf9a8b1cddb0291da5212ec0

Authored by 徐近程
2 parents 823af6ed 1ffdcd50

Merge branch 'dev'

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @8f2d77e
@@ -349,7 +349,7 @@ public class VideosController extends BaseController { @@ -349,7 +349,7 @@ public class VideosController extends BaseController {
349 cell.setCellValue("spid"); 349 cell.setCellValue("spid");
350 cell = row.createCell(16);//列 350 cell = row.createCell(16);//列
351 cell.setCellValue("sp简称"); 351 cell.setCellValue("sp简称");
352 - 352 +
353 for (int i = 0; i < shyVideosList.size(); i++) { 353 for (int i = 0; i < shyVideosList.size(); i++) {
354 row = sheetlist.createRow((short) (i + 1));//行 354 row = sheetlist.createRow((short) (i + 1));//行
355 cell = row.createCell(0);//列 355 cell = row.createCell(0);//列
@@ -365,14 +365,14 @@ public class VideosController extends BaseController { @@ -365,14 +365,14 @@ public class VideosController extends BaseController {
365 cell = row.createCell(5);//列 365 cell = row.createCell(5);//列
366 /* 审核员需要做处理*/ 366 /* 审核员需要做处理*/
367 if (shyVideosList.get(i).getState() != CommonConst.AUDIT_INTT) { 367 if (shyVideosList.get(i).getState() != CommonConst.AUDIT_INTT) {
368 - updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater())? "白名单":shyVideosList.get(i).getUpdater(); 368 + updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater())? "白名单":shyVideosList.get(i).getUpdater();
369 String auditor_id = shyVideosList.get(i).getAuditor_id(); 369 String auditor_id = shyVideosList.get(i).getAuditor_id();
370 if (CommonUtils.isNotEmpty(auditor_id)) { 370 if (CommonUtils.isNotEmpty(auditor_id)) {
371 ShyUsers user = new ShyUsers(); 371 ShyUsers user = new ShyUsers();
372 user.setUser_id(auditor_id); 372 user.setUser_id(auditor_id);
373 user = usersService.select(user); 373 user = usersService.select(user);
374 if (CommonUtils.isNotNull(user)) { 374 if (CommonUtils.isNotNull(user)) {
375 - String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail(); 375 + String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
376 String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername(); 376 String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
377 updater = userName ; 377 updater = userName ;
378 } 378 }
@@ -408,17 +408,17 @@ public class VideosController extends BaseController { @@ -408,17 +408,17 @@ public class VideosController extends BaseController {
408 cell = row.createCell(15);//列 408 cell = row.createCell(15);//列
409 cell.setCellValue(shyVideosList.get(i).getSpid()); 409 cell.setCellValue(shyVideosList.get(i).getSpid());
410 cell = row.createCell(16);//列 410 cell = row.createCell(16);//列
411 - 411 +
412 //显示spid简称 412 //显示spid简称
413 ShySites shySites = sitesService.findspidDescByspid(shyVideosList.get(i).getSpid()); 413 ShySites shySites = sitesService.findspidDescByspid(shyVideosList.get(i).getSpid());
414 if (CommonUtils.isNotNull(shySites)) { 414 if (CommonUtils.isNotNull(shySites)) {
415 - if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_WITNESS)){  
416 - cell.setCellValue(shySites.getName()+"(目击者)");  
417 - }else if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_MOMENT)){  
418 - cell.setCellValue(shySites.getName()+"(朋友圈)");  
419 - }else{  
420 - cell.setCellValue(shySites.getName());  
421 - } 415 + if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_WITNESS)){
  416 + cell.setCellValue(shySites.getName()+"(目击者)");
  417 + }else if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_MOMENT)){
  418 + cell.setCellValue(shySites.getName()+"(朋友圈)");
  419 + }else{
  420 + cell.setCellValue(shySites.getName());
  421 + }
422 } 422 }
423 } 423 }
424 424