20201127v1.6

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;
     }

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);

mt/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
-    include: common, util-dev
+    include: common, util-prod
 
 

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">

tall/src/main/resources/application.yml

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

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+")) {
+                    if(ObjectUtil.isNull(cell.value)) {
-                        newCell.setCellValue(Long.parseLong(cell.value));
+                        log.info("单元格内容为空:{}", cell.value);
-                    } else {
+                    }else {
-                        newCell.setCellValue(cell.value);
+                        log.info("单元格内容:{}", cell.value);
+                        if (cell.value.length() <= 14 && cell.value.matches("\\d+")) {
+                            newCell.setCellValue(Long.parseLong(cell.value));
+                        } else {
+                            newCell.setCellValue(cell.value);
+                        }
                     }
                 }
                 //设置行高