From f7059f23731da0daaac5032d1ee603096bd1a0fc Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 27 Nov 2020 13:48:47 +0800
Subject: [PATCH] 20201127v1.6

---
 mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java |  2 +-
 .../java/com/ccsens/mt/service/ExcelService.java    |  1 -
 mt/src/main/resources/application.yml               |  4 ++--
 .../mapper_dao/CompeteProjectConfigDao.xml          |  1 +
 tall/src/main/resources/application.yml             |  4 ++--
 util/src/main/java/com/ccsens/util/PoiUtil.java     | 13 +++++++++----
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java
index 648516b6..e2577bf9 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java
@@ -251,7 +251,7 @@ public class ScoreVo {
         @ApiModelProperty("最终成绩")
         private BigDecimal finalScore;
         @ApiModelProperty("备注")
-        private String remark;
+        private String remark = "";
         @ApiModelProperty("名次")
         private int rangee;
     }
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 1e64fb7e..f9cc1991 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@@ -1442,7 +1442,6 @@ public class ExcelService implements IExcelService {
         }
         List<ScoreVo.CountScorePublicity> countScoreCurrentSites = countScoreCurrentSiteList;
 
-
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
         PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(计数赛)", 10, 1);
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index a47f2a7b..1ac895fc 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: prod
+    include: common, util-prod
 
 
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index 3fbc2fe2..acfee8ae 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -396,6 +396,7 @@
       and(a.ppId is not null or b.teamId is not null)
       and so.rec_status = 0
       and pr.rec_status = 0
+      and pc.rec_status = 0
       ORDER BY so.start_time
     </select>
     <select id="queryProjectByTaskDetailId" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$QueryProjectByTall">
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..e75cc2c3 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common
 
diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java
index 792badf0..edb027e3 100644
--- a/util/src/main/java/com/ccsens/util/PoiUtil.java
+++ b/util/src/main/java/com/ccsens/util/PoiUtil.java
@@ -183,10 +183,15 @@ public class PoiUtil {
 //                    }else {
 //                        newCell.setCellValue(cell.value);
 //                    }
-                    if (cell.value.length() <= 14 && cell.value.matches("\\d+")) {
-                        newCell.setCellValue(Long.parseLong(cell.value));
-                    } else {
-                        newCell.setCellValue(cell.value);
+                    if(ObjectUtil.isNull(cell.value)) {
+                        log.info("单元格内容为空:{}", cell.value);
+                    }else {
+                        log.info("单元格内容:{}", cell.value);
+                        if (cell.value.length() <= 14 && cell.value.matches("\\d+")) {
+                            newCell.setCellValue(Long.parseLong(cell.value));
+                        } else {
+                            newCell.setCellValue(cell.value);
+                        }
                     }
                 }
                 //设置行高