11-12-1

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -305,4 +305,25 @@ public class CompeteDto {
         @ApiModelProperty("")
         private String fileBase64;
     }
+
+
+    @Data
+    @ApiModel
+    public static class EnterInfo{
+        @NotNull
+        @ApiModelProperty("第几届信息的id")
+        private Long competeTimeId;
+        @ApiModelProperty("项目名")
+        private String projectName;
+        @ApiModelProperty("组别")
+        private String groupName;
+        @ApiModelProperty("团队名")
+        private String companyName;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("身份证号")
+        private Long idCard;
+    }
+
+
 }

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

@@ -1,4 +1,5 @@
 package com.ccsens.mt.service;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -811,7 +812,12 @@ public class ExcelService implements IExcelService {
                     //单项时间
                     dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
                     //场地
-                    dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
+                    int siteNum = competeProjectConfig.getSiteNum();
+                    if(siteNum == 0){
+                        dailyScheduleProcess.setSiteNum(1);
+                    }else{
+                        dailyScheduleProcess.setSiteNum(siteNum);
+                    }
                     //场次
                     double a = (double)count / (double)competeProjectConfig.getSiteNum();
                     double times = Math.ceil(a);
@@ -842,7 +848,12 @@ public class ExcelService implements IExcelService {
                     //单项时间
                     dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
                     //场地
-                    dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
+                    int siteNum = competeProjectConfig.getSiteNum();
+                    if(siteNum == 0){
+                        dailyScheduleProcess.setSiteNum(1);
+                    }else{
+                        dailyScheduleProcess.setSiteNum(siteNum);
+                    }
                     //场次
                     double a = (double)count / (double)competeProjectConfig.getSiteNum();
                     double times = Math.ceil(a);
@@ -894,7 +905,12 @@ public class ExcelService implements IExcelService {
             if (ObjectUtil.isNotNull(competeProjectConfig1)) {
                 dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration());
                 //场地
-                dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum());
+                int siteNum = competeProjectConfig1.getSiteNum();
+                if (siteNum == 0){
+                    dailyScheduleProcess.setSiteNum(1);
+                }else {
+                    dailyScheduleProcess.setSiteNum(siteNum);
+                }
                 //场次
                 double a  =  (double) updateAndSearch.getJoinNum() /(double) competeProjectConfig1.getSiteNum();
                 double games = Math.ceil(a);
@@ -1073,6 +1089,8 @@ public class ExcelService implements IExcelService {
         List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListDown = new ArrayList<>();
         //关联查询项目名，该项目在config和project中都存在
         List<TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
+        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
+        if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) {
             for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) {
                 //项目名
                 String projectName = schedulePlanDetail.getProjectName();
@@ -1105,12 +1123,11 @@ public class ExcelService implements IExcelService {
                     schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
                 }
             }
-        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
+
             schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
             schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
+        }
         return schedulePlan;
     }
-
-
 }
 

tall/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7030
+  port: 7070
   servlet:
     context-path: /v1.0
 spring: