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

20201121v1.9

tiaosheng
zy_Java 5 years ago
parent
17ec78bc60
commit
645ea25701
4 changed files with 301 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java
  2. 444
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  3. 4
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  4. 31
      mt/src/main/resources/mapper_dao/CompeteProjectDao.xml

2
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java
View File

@ -24,5 +24,5 @@ public interface CompeteProjectDao extends CompeteProjectMapper {
* @param projectId * @param projectId
* @return * @return
*/ */
List<Long> queryJoinNum(@Param("projectId")Long projectId); List<Long> queryJoinNum(@Param("team")byte team,@Param("projectId")Long projectId);
} }

444
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
View File

@ -80,9 +80,9 @@ public class CompeteTaskService implements ICompeteTaskService{
} }
param.getUpdateCompeteTaskList().forEach(projectConfig -> { param.getUpdateCompeteTaskList().forEach(projectConfig -> {
//判断时间和时长是否正确 //判断时间和时长是否正确
if(ObjectUtil.isNotNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0 if(ObjectUtil.isNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0
|| ObjectUtil.isNotNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 || || ObjectUtil.isNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 ||
ObjectUtil.isNotNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0){ ObjectUtil.isNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0){
return; return;
} }
//获取项目 //获取项目
@ -103,6 +103,7 @@ public class CompeteTaskService implements ICompeteTaskService{
competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig);
log.info("修改比赛日程配置：{}",competeProjectConfig);
}else { }else {
//没有则添加 //没有则添加
competeProjectConfig = new CompeteProjectConfig(); competeProjectConfig = new CompeteProjectConfig();
@ -113,6 +114,7 @@ public class CompeteTaskService implements ICompeteTaskService{
competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
projectConfigDao.insertSelective(competeProjectConfig); projectConfigDao.insertSelective(competeProjectConfig);
log.info("添加比赛日程配置：{}",competeProjectConfig);
} }
//生成出场顺序表，存入数据库。在tall内添加对应的任务 //生成出场顺序表，存入数据库。在tall内添加对应的任务
setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token);
@ -129,188 +131,276 @@ public class CompeteTaskService implements ICompeteTaskService{
CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
if (ObjectUtil.isNotNull(project)) { if (ObjectUtil.isNotNull(project)) {
//查询项目下的参赛人数或队伍 //查询项目下的参赛人数或队伍
// List<Long> projectPlayerIdList = competeProjectDao.queryJoinNum(project.getId()); List<Long> playerIdOrTeamIdList = competeProjectDao.queryJoinNum(project.getTeam(),project.getId());
//判断是团队还是个人项目 log.info("本项目参加的人数：{}",playerIdOrTeamIdList);
if (project.getTeam() == 0) { if (CollectionUtil.isNotEmpty(playerIdOrTeamIdList)) {
//个人项目查找所有参赛信息 //计算场次
CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); int order = (int) Math.ceil(playerIdOrTeamIdList.size() / projectConfig.getSiteNum());
projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId()); //计算每个场次时间
List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); long projectStartTime = projectConfig.getStartTime();
long orderTime = 0;
if (CollectionUtil.isNotEmpty(projectPlayerList)) { if(order != 0) {
//计算场次 orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); }else {
//计算每个场次时间 log.info("场次为0的比赛：{}------{}",project,projectConfig);
long projectStartTime = projectConfig.getStartTime(); }
long orderTime = 0; //场次
if(order != 0) { int competeOrder = 1;
orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场地
}else { int site = 1;
log.info("场次为0的比赛：{}------{}",project,projectConfig); for (Long playerIdOrTeamId : playerIdOrTeamIdList) {
} CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
//场次 startOrderExample.createCriteria().andPlayerIdEqualTo(playerIdOrTeamId).andProjectIdEqualTo(project.getId());
int competeOrder = 1; List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
//场地 log.info("当前选手或团队参加的场次信息：{}",startOrderList);
int site = 1; if(CollectionUtil.isNotEmpty(startOrderList)){
for (CompeteProjectPlayer projectPlayer : projectPlayerList) { CompeteStartOrder competeStartOrder = startOrderList.get(0);
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); competeStartOrder.setSite((byte) site);
startOrderExample.createCriteria().andPlayerIdEqualTo(projectPlayer.getId()).andProjectIdEqualTo(project.getId()); competeStartOrder.setCompeteOrder((byte) competeOrder);
List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample); if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
if(CollectionUtil.isNotEmpty(startOrderList)){
CompeteStartOrder competeStartOrder = startOrderList.get(0);
competeStartOrder.setSite((byte) site);
competeStartOrder.setCompeteOrder((byte) competeOrder);
if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime);
// 修改tall的任务
TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
updateTaskInfo.setId(competeStartOrder.getId());
updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token);
log.info("修改tall的任务信息：{}",updateTaskInfo);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
//失败return
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
return;
}
}
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
}else{
//添加tall的任务
Long taskId = null;
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
addTask.setProjectId(tallProjectId);
addTask.setTaskName(project.getName() + competeOrder +"-" + site);
addTask.setBeginTime(projectStartTime);
addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(tallRoleId);
addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return
log.info("添加任务后返回：{}",normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
return;
}
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) {
taskId = normalTask.getDetailId();
}
//添加出场顺序信息
CompeteStartOrder competeStartOrder = new CompeteStartOrder();
competeStartOrder.setId(snowflake.nextId());
competeStartOrder.setProjectId(project.getId());
competeStartOrder.setPlayerId(projectPlayer.getId());
competeStartOrder.setSite((byte) site);
competeStartOrder.setTeam((byte) 0);
competeStartOrder.setCompeteOrder((byte) competeOrder);
competeStartOrder.setTaskId(taskId);
competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime); competeStartOrder.setEndTime(projectStartTime + orderTime);
startOrderMapper.insertSelective(competeStartOrder); // 修改tall的任务
} TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
site++; updateTaskInfo.setId(competeStartOrder.getId());
if(site > projectConfig.getSiteNum()){ updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
site = 1; updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
competeOrder++; updateTaskInfo.setToken(token);
projectStartTime += orderTime; log.info("修改tall的任务信息：{}",updateTaskInfo);
} JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
} log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
} //失败return
} else { if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
//团体项目查找所有参赛队伍
CompeteTeamExample teamExample = new CompeteTeamExample();
teamExample.createCriteria().andProjectIdEqualTo(project.getId());
List<CompeteTeam> teamList = competeTeamDao.selectByExample(teamExample);
if(CollectionUtil.isNotEmpty(teamList)){
//计算场次
int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum());
//计算每个场次时间
long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME;
long orderTime = 0;
if(order != 0) {
orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
}
//场次
int competeOrder = 1;
//场地
int site = 1;
for (CompeteTeam competeTeam : teamList) {
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
startOrderExample.createCriteria().andPlayerIdEqualTo(competeTeam.getId()).andProjectIdEqualTo(project.getId());
List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
if(CollectionUtil.isNotEmpty(startOrderList)){
CompeteStartOrder competeStartOrder = startOrderList.get(0);
competeStartOrder.setSite((byte) site);
competeStartOrder.setCompeteOrder((byte) competeOrder);
if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime);
//修改tall的任务
TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
updateTaskInfo.setId(competeStartOrder.getId());
updateTaskInfo.setBeginTime(competeStartOrder.getId());
updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token);
log.info("修改tall的任务信息：{}",updateTaskInfo);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
//失败return
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
return;
}
}
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
}else{
//添加tall的任务
Long taskId = null;
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
addTask.setProjectId(tallProjectId);
addTask.setTaskName(project.getName() + competeOrder +"-" + site);
addTask.setBeginTime(projectStartTime);
addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(tallRoleId);
addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
log.info("添加任务后返回：{}",normalTaskJsonResponse);
//异常return
log.info("添加任务后返回：{}",normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
return; return;
} }
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) {
taskId = normalTask.getDetailId();
}
//添加出场顺序信息
CompeteStartOrder competeStartOrder = new CompeteStartOrder();
competeStartOrder.setId(snowflake.nextId());
competeStartOrder.setProjectId(project.getId());
competeStartOrder.setPlayerId(competeTeam.getId());
competeStartOrder.setSite((byte) site);
competeStartOrder.setTeam((byte) 0);
competeStartOrder.setCompeteOrder((byte) competeOrder);
competeStartOrder.setTaskId(taskId);
competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime);
startOrderMapper.insertSelective(competeStartOrder);
} }
site++; log.info("修改场次信息：{}",competeStartOrder);
if(site > projectConfig.getSiteNum()){ startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
site = 1; }else{
competeOrder++; //添加tall的任务
projectStartTime += orderTime; Long taskId = null;
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
addTask.setProjectId(tallProjectId);
addTask.setTaskName(project.getName() + competeOrder +"-" + site);
addTask.setBeginTime(projectStartTime);
addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(tallRoleId);
addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return
log.info("添加任务后返回：{}",normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
return;
}
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) {
taskId = normalTask.getDetailId();
} }
//添加出场顺序信息
CompeteStartOrder competeStartOrder = new CompeteStartOrder();
competeStartOrder.setId(snowflake.nextId());
competeStartOrder.setProjectId(project.getId());
competeStartOrder.setPlayerId(playerIdOrTeamId);
competeStartOrder.setSite((byte) site);
competeStartOrder.setTeam((byte) 0);
competeStartOrder.setCompeteOrder((byte) competeOrder);
competeStartOrder.setTaskId(taskId);
competeStartOrder.setStartTime(projectStartTime);
competeStartOrder.setEndTime(projectStartTime + orderTime);
log.info("添加场次信息：{}",competeStartOrder);
startOrderMapper.insertSelective(competeStartOrder);
}
site++;
if(site > projectConfig.getSiteNum()){
site = 1;
competeOrder++;
projectStartTime += orderTime;
} }
} }
} }
} }
// //判断是团队还是个人项目
// if (project.getTeam() == 0) {
// //个人项目查找所有参赛信息
// CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
// projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId());
// List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
//
// if (CollectionUtil.isNotEmpty(projectPlayerList)) {
// //计算场次
// int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum());
// //计算每个场次时间
// long projectStartTime = projectConfig.getStartTime();
// long orderTime = 0;
// if(order != 0) {
// orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
// }else {
// log.info("场次为0的比赛：{}------{}",project,projectConfig);
// }
// //场次
// int competeOrder = 1;
// //场地
// int site = 1;
// for (CompeteProjectPlayer projectPlayer : projectPlayerList) {
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
// startOrderExample.createCriteria().andPlayerIdEqualTo(projectPlayer.getId()).andProjectIdEqualTo(project.getId());
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
// if(CollectionUtil.isNotEmpty(startOrderList)){
// CompeteStartOrder competeStartOrder = startOrderList.get(0);
// competeStartOrder.setSite((byte) site);
// competeStartOrder.setCompeteOrder((byte) competeOrder);
// if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
// competeStartOrder.setStartTime(projectStartTime);
// competeStartOrder.setEndTime(projectStartTime + orderTime);
// // 修改tall的任务
// TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
// updateTaskInfo.setId(competeStartOrder.getId());
// updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
// updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
// updateTaskInfo.setToken(token);
// log.info("修改tall的任务信息：{}",updateTaskInfo);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
// log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
// //失败return
// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
// return;
// }
// }
// startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
//
// }else{
// //添加tall的任务
// Long taskId = null;
// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
// addTask.setProjectId(tallProjectId);
// addTask.setTaskName(project.getName() + competeOrder +"-" + site);
// addTask.setBeginTime(projectStartTime);
// addTask.setEndTime(projectStartTime + orderTime);
// addTask.setExecutorId(tallRoleId);
// addTask.setToken(token);
// log.info("在tall内添加任务：{}",addTask);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
// //异常return
// log.info("添加任务后返回：{}",normalTaskJsonResponse);
// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
// return;
// }
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
// if (ObjectUtil.isNotNull(normalTask)) {
// taskId = normalTask.getDetailId();
// }
// //添加出场顺序信息
// CompeteStartOrder competeStartOrder = new CompeteStartOrder();
// competeStartOrder.setId(snowflake.nextId());
// competeStartOrder.setProjectId(project.getId());
// competeStartOrder.setPlayerId(projectPlayer.getId());
// competeStartOrder.setSite((byte) site);
// competeStartOrder.setTeam((byte) 0);
// competeStartOrder.setCompeteOrder((byte) competeOrder);
// competeStartOrder.setTaskId(taskId);
// competeStartOrder.setStartTime(projectStartTime);
// competeStartOrder.setEndTime(projectStartTime + orderTime);
// startOrderMapper.insertSelective(competeStartOrder);
// }
// site++;
// if(site > projectConfig.getSiteNum()){
// site = 1;
// competeOrder++;
// projectStartTime += orderTime;
// }
// }
// }
// } else {
// //团体项目查找所有参赛队伍
// CompeteTeamExample teamExample = new CompeteTeamExample();
// teamExample.createCriteria().andProjectIdEqualTo(project.getId());
// List<CompeteTeam> teamList = competeTeamDao.selectByExample(teamExample);
// if(CollectionUtil.isNotEmpty(teamList)){
// //计算场次
// int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum());
// //计算每个场次时间
// long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME;
// long orderTime = 0;
// if(order != 0) {
// orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
// }
// //场次
// int competeOrder = 1;
// //场地
// int site = 1;
// for (CompeteTeam competeTeam : teamList) {
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
// startOrderExample.createCriteria().andPlayerIdEqualTo(competeTeam.getId()).andProjectIdEqualTo(project.getId());
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
// if(CollectionUtil.isNotEmpty(startOrderList)){
// CompeteStartOrder competeStartOrder = startOrderList.get(0);
// competeStartOrder.setSite((byte) site);
// competeStartOrder.setCompeteOrder((byte) competeOrder);
// if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
// competeStartOrder.setStartTime(projectStartTime);
// competeStartOrder.setEndTime(projectStartTime + orderTime);
// //修改tall的任务
// TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
// updateTaskInfo.setId(competeStartOrder.getId());
// updateTaskInfo.setBeginTime(competeStartOrder.getId());
// updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
// updateTaskInfo.setToken(token);
// log.info("修改tall的任务信息：{}",updateTaskInfo);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
// log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
// //失败return
// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
// return;
// }
// }
// startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
//
// }else{
// //添加tall的任务
// Long taskId = null;
// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
// addTask.setProjectId(tallProjectId);
// addTask.setTaskName(project.getName() + competeOrder +"-" + site);
// addTask.setBeginTime(projectStartTime);
// addTask.setEndTime(projectStartTime + orderTime);
// addTask.setExecutorId(tallRoleId);
// addTask.setToken(token);
// log.info("在tall内添加任务：{}",addTask);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
// log.info("添加任务后返回：{}",normalTaskJsonResponse);
// //异常return
// log.info("添加任务后返回：{}",normalTaskJsonResponse);
// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
// return;
// }
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
// if (ObjectUtil.isNotNull(normalTask)) {
// taskId = normalTask.getDetailId();
// }
// //添加出场顺序信息
// CompeteStartOrder competeStartOrder = new CompeteStartOrder();
// competeStartOrder.setId(snowflake.nextId());
// competeStartOrder.setProjectId(project.getId());
// competeStartOrder.setPlayerId(competeTeam.getId());
// competeStartOrder.setSite((byte) site);
// competeStartOrder.setTeam((byte) 0);
// competeStartOrder.setCompeteOrder((byte) competeOrder);
// competeStartOrder.setTaskId(taskId);
// competeStartOrder.setStartTime(projectStartTime);
// competeStartOrder.setEndTime(projectStartTime + orderTime);
// startOrderMapper.insertSelective(competeStartOrder);
// }
// site++;
// if(site > projectConfig.getSiteNum()){
// site = 1;
// competeOrder++;
// projectStartTime += orderTime;
// }
// }
// }
// }
// }
} }
} }
@ -428,7 +518,6 @@ public class CompeteTaskService implements ICompeteTaskService{
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
competeJudgmentDao.insertSelective(competeJudgment); competeJudgmentDao.insertSelective(competeJudgment);
//添加角色 //添加角色
MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
saveRole.setProjectId(tallProjectId); saveRole.setProjectId(tallProjectId);
@ -522,6 +611,9 @@ public class CompeteTaskService implements ICompeteTaskService{
} }
} }
} }
competeJudgment.setRoleId(roleId);
competeJudgment.setMemberId(memberId);
competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment);
} }
} }

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

@ -1268,7 +1268,7 @@ public class ExcelService implements IExcelService {
String year = simpleDateFormat.format(date); String year = simpleDateFormat.format(date);
Date date1 = new Date(schedulePlanDetail.getEndTime()); Date date1 = new Date(schedulePlanDetail.getEndTime());
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String year1 = simpleDateFormat.format(date); String year1 = simpleDateFormat1.format(date1);
String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")";
stringBuilder.append(string+" \n"); stringBuilder.append(string+" \n");
@ -1299,7 +1299,7 @@ public class ExcelService implements IExcelService {
String year = simpleDateFormat.format(date); String year = simpleDateFormat.format(date);
Date date1 = new Date(schedulePlanDetail.getEndTime()); Date date1 = new Date(schedulePlanDetail.getEndTime());
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
String year1 = simpleDateFormat.format(date); String year1 = simpleDateFormat1.format(date1);
String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")";
stringBuilder.append(string+" "); stringBuilder.append(string+" ");
} }

31
mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
View File

@ -62,6 +62,35 @@
and c.rec_status = 0 and c.rec_status = 0
</select> </select>
<select id="queryJoinNum" resultType="java.lang.Long"> <select id="queryJoinNum" resultType="java.lang.Long">
<if test="team == 0">
SELECT
pp.id
FROM
t_compete_project_player pp
LEFT JOIN t_compete_player p on pp.player_id = p.id
LEFT JOIN t_compete_group g on p.compete_group_id = g.id
LEFT JOIN t_compete_company c on p.company_id = c.id
WHERE
pp.project_id = 2011
and pp.rec_status = 0
and p.rec_status = 0
and g.rec_status = 0
and c.rec_status = 0
ORDER BY g.id
</if>
<if test="team == 1">
SELECT
t.id
FROM
t_compete_team t
LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
LEFT JOIN t_compete_company c on t.company_id = c.id
WHERE
t.project_id = 2022
and t.rec_status = 0
and g.rec_status = 0
and c.rec_status = 0
ORDER BY g.id
</if>
</select> </select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save