From 5a92b65f36ab302b74daaaaa3b242cff1a05d848 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Mon, 16 Nov 2020 18:38:03 +0800
Subject: [PATCH 1/2] 123

---
 mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
index 9b765c08..53e01e8f 100644
--- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
@@ -42,7 +42,7 @@ public class CompeteVideoController {
     @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.Vdeo> params) {
-        log.info("添加用户观看开幕式视频记录（签到用）",params);
+        log.info("添加用户观看开幕式视频记录（签到用）{}",params);
         boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId());
         return JsonResponse.newInstance().ok(code);
     }

From dcab17f8504a99df8b59d9d899bacf49f63890c4 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Thu, 19 Nov 2020 11:22:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/mt/service/ExcelService.java   | 14 ++++++++++----
 mt/src/main/resources/application.yml              |  4 ++--
 util/src/main/java/com/ccsens/util/PoiUtil.java    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
index 24fc463a..a810070f 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/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;
     }
 
 
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index f59084b0..4ecd13fd 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev
 
diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java
index 3bbcb1c2..af0f96ad 100644
--- a/util/src/main/java/com/ccsens/util/PoiUtil.java
+++ b/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 {