Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@@ -41,6 +41,7 @@ public class CompeteVideoController {
     @MustLogin
     @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false")
     @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+
     public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Video> params) {
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
         boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId());

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -346,6 +346,8 @@ public class ExcelService implements IExcelService {
                 for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
                     //查询每个报名人的详细信息下
                     CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
+                    if(ObjectUtil.isNotNull(competePlayer)){
+
                     TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
                     //姓名
                     competeJoin.setName(competePlayer.getName());
@@ -401,6 +403,7 @@ public class ExcelService implements IExcelService {
                     //项目id
                     competeJoin.setProjectId(competeProject.getId());
                     competeJoinList.add(competeJoin);
+                    }
                 }
 
             } else { //团队项目
@@ -416,6 +419,8 @@ public class ExcelService implements IExcelService {
                     for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
                         //查询成员详细信息
                         CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
+                        if(ObjectUtil.isNotNull(competePlayer)){
+
                         TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
                         //姓名
                         competeJoin.setName(competePlayer.getName());
@@ -474,6 +479,7 @@ public class ExcelService implements IExcelService {
                         competeJoin.setProjectId(competeProject.getId());
                         competeJoinList.add(competeJoin);
                     }
+                    }
                 }
             }
         }
@@ -552,7 +558,7 @@ public class ExcelService implements IExcelService {
         OutputStream stream = new FileOutputStream(file);
         wbs.write(stream);
         stream.close();
-        return path;
+        return PropUtil.imgDomain+filepath;
     }
 
 
@@ -650,7 +656,7 @@ public class ExcelService implements IExcelService {
         OutputStream stream = new FileOutputStream(file);
         wbs.write(stream);
         stream.close();
-        return path;
+        return PropUtil.imgDomain+filepath;
     }
 
     @Override
@@ -948,7 +954,7 @@ public class ExcelService implements IExcelService {
             i++;
         }
         //生成excel表格对象，并将数据放入
-        Workbook wbs = PoiUtil.exportWB("XXX比赛报名汇总表", list, workbook);
+        Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook);
         //8：关联金山在线文档
         String name = "参赛人数统计表" + ".xlsx";
         String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
@@ -963,7 +969,7 @@ public class ExcelService implements IExcelService {
         OutputStream stream = new FileOutputStream(file);
         wbs.write(stream);
         stream.close();
-        return path;
+        return PropUtil.imgDomain+filepath;
     }
 
 

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev
 

util/src/main/java/com/ccsens/util/PoiUtil.java

@@ -177,7 +177,7 @@ public class PoiUtil {
 //                }
                 CellStyle style = wb.createCellStyle();
                 //设置内容
-                if (!cell.value.equals(WebConstant.CELL_NULL)){
+                if (!WebConstant.CELL_NULL.equals(cell.value)){
                     if(cell.num == 1){
                         newCell.setCellValue(Integer.parseInt(cell.value));
                     }else {