ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

11-12-1

tiaosheng
Lihong@123456 5 years ago
parent
99cd3aeb43
commit
c55816c3d9
4 changed files with 79 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  2. 95
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  3. 2
      mt/src/main/resources/application.yml
  4. 2
      tall/src/main/resources/application-dev.yml

21
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
View File

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

95
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -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();
for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList){
//项目名
String projectName = schedulePlanDetail.getProjectName();
//开始时间yyyy-MM-dd HH:mm:ss
long startTime = schedulePlanDetail.getStartTime();
Date date = new Date(startTime);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
String sm = simpleDateFormat.format(date);
//结束时间
long endTime = schedulePlanDetail.getEndTime();
Date date1 = new Date(endTime);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String em = simpleDateFormat1.format(date1);
//拼接
String string = projectName + "("+ sm +"-"+ em + ")";
//项目开始日期
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
String md = simpleDateFormat2.format(date);
//上午项目
if (Integer.parseInt(sm.substring(0,2)) >= 6 && Integer.parseInt(sm.substring(0,2)) <= 12){
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn.setData(md);
schedulePlanDetailAllIn.setString(string);
schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
}//下午项目
else if (Integer.parseInt(sm.substring(0,2)) > 12 && Integer.parseInt(sm.substring(0,2)) <= 18){
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn1.setData(md);
schedulePlanDetailAllIn1.setString(string);
schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
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();
//开始时间yyyy-MM-dd HH:mm:ss
long startTime = schedulePlanDetail.getStartTime();
Date date = new Date(startTime);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
String sm = simpleDateFormat.format(date);
//结束时间
long endTime = schedulePlanDetail.getEndTime();
Date date1 = new Date(endTime);
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String em = simpleDateFormat1.format(date1);
//拼接
String string = projectName + "(" + sm + "-" + em + ")";
//项目开始日期
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
String md = simpleDateFormat2.format(date);
//上午项目
if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) {
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
schedulePlanDetailAllIn.setData(md);
schedulePlanDetailAllIn.setString(string);
schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
}//下午项目
else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) {
TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
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;
}
}

2
mt/src/main/resources/application.yml
View File

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

2
tall/src/main/resources/application-dev.yml
View File

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

Write Preview
Loading…
Cancel
Save