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);
@@ -1072,45 +1088,46 @@ public class ExcelService implements IExcelService {
         List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListUp = new ArrayList<>();
         List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListDown = new ArrayList<>();
         //关联查询项目名，该项目在config和project中都存在
-        List <TableVo.SchedulePlanDetail> schedulePlanDetailList  = competeProjectConfigDao.selectDetail();
+        List<TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
-        for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList){
+        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
-            //项目名
+        if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) {
-            String projectName = schedulePlanDetail.getProjectName();
+            for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) {
-            //开始时间yyyy-MM-dd HH:mm:ss
+                //项目名
-            long startTime = schedulePlanDetail.getStartTime();
+                String projectName = schedulePlanDetail.getProjectName();
-            Date date = new Date(startTime);
+                //开始时间yyyy-MM-dd HH:mm:ss
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
+                long startTime = schedulePlanDetail.getStartTime();
-            String sm = simpleDateFormat.format(date);
+                Date date = new Date(startTime);
-            //结束时间
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
-            long endTime = schedulePlanDetail.getEndTime();
+                String sm = simpleDateFormat.format(date);
-            Date date1 = new Date(endTime);
+                //结束时间
-            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
+                long endTime = schedulePlanDetail.getEndTime();
-            String em = simpleDateFormat1.format(date1);
+                Date date1 = new Date(endTime);
-            //拼接
+                SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
-            String string =  projectName + "("+ sm +"-"+ em + ")";
+                String em = simpleDateFormat1.format(date1);
-            //项目开始日期
+                //拼接
-            SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
+                String string = projectName + "(" + sm + "-" + em + ")";
-            String md = simpleDateFormat2.format(date);
+                //项目开始日期
-            //上午项目
+                SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
-            if (Integer.parseInt(sm.substring(0,2)) >= 6 && Integer.parseInt(sm.substring(0,2)) <= 12){
+                String md = simpleDateFormat2.format(date);
-                TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
+                //上午项目
-                schedulePlanDetailAllIn.setData(md);
+                if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) {
-                schedulePlanDetailAllIn.setString(string);
+                    TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
-                schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
+                    schedulePlanDetailAllIn.setData(md);
-            }//下午项目
+                    schedulePlanDetailAllIn.setString(string);
-            else if (Integer.parseInt(sm.substring(0,2)) > 12 && Integer.parseInt(sm.substring(0,2)) <= 18){
+                    schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
-                TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
+                }//下午项目
-                schedulePlanDetailAllIn1.setData(md);
+                else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) {
-                schedulePlanDetailAllIn1.setString(string);
+                    TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
-                schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
+                    schedulePlanDetailAllIn1.setData(md);
+                    schedulePlanDetailAllIn1.setString(string);
+                    schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
+                }
             }
+
+            schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
+            schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
         }
-        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
-        schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
-        schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
         return schedulePlan;
     }
-
-
 }
 

mt/src/main/resources/application.yml

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

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

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