|
|
@ -1466,6 +1466,7 @@ public class CompeteService implements ICompeteService { |
|
|
|
public PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) { |
|
|
|
long projectId = params.getProjectId(); |
|
|
|
long competeTimeId = params.getCompeteTimeId(); |
|
|
|
Byte type = 0; |
|
|
|
PageHelper.startPage(params.getPage(),params.getSize()); |
|
|
|
List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); |
|
|
|
PageInfo pageInfo = new PageInfo<>(speedPassList); |
|
|
@ -1473,13 +1474,13 @@ public class CompeteService implements ICompeteService { |
|
|
|
for (CompeteVo.SpeedPass mes : speedPassList) { |
|
|
|
//查30s单摇跳得分
|
|
|
|
CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); |
|
|
|
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); |
|
|
|
competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type); |
|
|
|
List<CompeteStartOrder> competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); |
|
|
|
if (competeStartOrders.size() > 0) { |
|
|
|
CompeteStartOrder competeStartOrder = competeStartOrders.get(0); |
|
|
|
long id = competeStartOrder.getId(); |
|
|
|
CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); |
|
|
|
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); |
|
|
|
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id).andRecStatusEqualTo(type); |
|
|
|
List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); |
|
|
|
CompeteCountScore competeCountScore = competeCountScoreList.get(0); |
|
|
|
BigDecimal score = competeCountScore.getFinalScore(); |
|
|
@ -1490,13 +1491,13 @@ public class CompeteService implements ICompeteService { |
|
|
|
} |
|
|
|
//3分钟单摇跳得分
|
|
|
|
CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); |
|
|
|
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); |
|
|
|
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); |
|
|
|
competeStartOrderExample1.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type); |
|
|
|
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample1); |
|
|
|
if (competeStartOrders1.size() > 0) { |
|
|
|
CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); |
|
|
|
CompeteStartOrder competeStartOrder1 = competeStartOrders1.get(0); |
|
|
|
long id1 = competeStartOrder1.getId(); |
|
|
|
CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); |
|
|
|
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); |
|
|
|
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1).andRecStatusEqualTo(type); |
|
|
|
List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); |
|
|
|
CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); |
|
|
|
BigDecimal score1 = competeCountScore1.getFinalScore(); |
|
|
@ -1511,6 +1512,7 @@ public class CompeteService implements ICompeteService { |
|
|
|
BigDecimal bigDecimal4 = new BigDecimal(120); |
|
|
|
BigDecimal bigDecimal5 = new BigDecimal(130); |
|
|
|
BigDecimal bigDecimal6 = new BigDecimal(140); |
|
|
|
|
|
|
|
BigDecimal bigDecimal7 = new BigDecimal(300); |
|
|
|
BigDecimal bigDecimal8 = new BigDecimal(380); |
|
|
|
BigDecimal bigDecimal9 = new BigDecimal(460); |
|
|
@ -1520,45 +1522,46 @@ public class CompeteService implements ICompeteService { |
|
|
|
BigDecimal s =mes.getSecondTime(); |
|
|
|
if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) { |
|
|
|
//判断30s单摇跳等级
|
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal0) < 1) { |
|
|
|
if (s.compareTo(bigDecimal0) >-1 && s.compareTo(bigDecimal2) <1) { |
|
|
|
mes.setSecondGrade(1); |
|
|
|
} |
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal2) < 1) { |
|
|
|
if (s.compareTo(bigDecimal2) >-1 && s.compareTo(bigDecimal3) <1) { |
|
|
|
mes.setSecondGrade(2); |
|
|
|
} |
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal3) < 1) { |
|
|
|
if (s.compareTo(bigDecimal3) >-1 && s.compareTo(bigDecimal4) <1) { |
|
|
|
mes.setSecondGrade(3); |
|
|
|
} |
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal4) < 1) { |
|
|
|
if (s.compareTo(bigDecimal4) >-1 && s.compareTo(bigDecimal5) <1) { |
|
|
|
mes.setSecondGrade(4); |
|
|
|
} |
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal5) < 1) { |
|
|
|
if (s.compareTo(bigDecimal5) >-1 && s.compareTo(bigDecimal6) <1) { |
|
|
|
mes.setSecondGrade(5); |
|
|
|
} |
|
|
|
if (mes.getSecondTime().compareTo(bigDecimal6) < 1) { |
|
|
|
if (s.compareTo(bigDecimal6)>-1) { |
|
|
|
mes.setSecondGrade(6); |
|
|
|
} |
|
|
|
//判断3分钟单摇跳等级
|
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) { |
|
|
|
BigDecimal m =mes.getMinuteTime(); |
|
|
|
if (m.compareTo(bigDecimal7) >-1 && m.compareTo(bigDecimal8)<1) { |
|
|
|
mes.setMinuteGrade(1); |
|
|
|
} |
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) { |
|
|
|
if (m.compareTo(bigDecimal8) >-1&& m.compareTo(bigDecimal9) <1) { |
|
|
|
mes.setMinuteGrade(2); |
|
|
|
} |
|
|
|
|
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) { |
|
|
|
if (m.compareTo(bigDecimal9) >-1&& m.compareTo(bigDecimal10) <1) { |
|
|
|
mes.setMinuteGrade(3); |
|
|
|
} |
|
|
|
|
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) { |
|
|
|
if (m.compareTo(bigDecimal10)>-1 && m.compareTo(bigDecimal11)<1) { |
|
|
|
mes.setMinuteGrade(4); |
|
|
|
} |
|
|
|
|
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) { |
|
|
|
if (m.compareTo(bigDecimal11)>-1 && m.compareTo(bigDecimal12)<1) { |
|
|
|
mes.setMinuteGrade(5); |
|
|
|
} |
|
|
|
|
|
|
|
if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) { |
|
|
|
if (m.compareTo(bigDecimal12)>-1) { |
|
|
|
mes.setMinuteGrade(6); |
|
|
|
} |
|
|
|
//如果30s得等级小于等于3分钟得等级
|
|
|
@ -1576,6 +1579,7 @@ public class CompeteService implements ICompeteService { |
|
|
|
public List<CompeteVo.SpeedPass> speedPassCha(CompeteDto.CompeteTimeAndProjectId params) { |
|
|
|
long projectId = params.getProjectId(); |
|
|
|
long competeTimeId = params.getCompeteTimeId(); |
|
|
|
Byte type = 0; |
|
|
|
PageHelper.startPage(params.getPage(),params.getSize()); |
|
|
|
List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); |
|
|
|
PageInfo pageInfo = new PageInfo<>(speedPassList); |
|
|
@ -1583,13 +1587,13 @@ public class CompeteService implements ICompeteService { |
|
|
|
for (CompeteVo.SpeedPass mes : speedPassList) { |
|
|
|
//查30s单摇跳得分
|
|
|
|
CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); |
|
|
|
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); |
|
|
|
competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type); |
|
|
|
List<CompeteStartOrder> competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); |
|
|
|
if (competeStartOrders.size() > 0) { |
|
|
|
CompeteStartOrder competeStartOrder = competeStartOrders.get(0); |
|
|
|
long id = competeStartOrder.getId(); |
|
|
|
CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); |
|
|
|
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); |
|
|
|
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id).andRecStatusEqualTo(type); |
|
|
|
List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); |
|
|
|
CompeteCountScore competeCountScore = competeCountScoreList.get(0); |
|
|
|
BigDecimal score = competeCountScore.getFinalScore(); |
|
|
@ -1600,13 +1604,13 @@ public class CompeteService implements ICompeteService { |
|
|
|
} |
|
|
|
//3分钟单摇跳得分
|
|
|
|
CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); |
|
|
|
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); |
|
|
|
competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type); |
|
|
|
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); |
|
|
|
if (competeStartOrders1.size() > 0) { |
|
|
|
CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); |
|
|
|
long id1 = competeStartOrder1.getId(); |
|
|
|
CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); |
|
|
|
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); |
|
|
|
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1).andRecStatusEqualTo(type); |
|
|
|
List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); |
|
|
|
CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); |
|
|
|
BigDecimal score1 = competeCountScore1.getFinalScore(); |
|
|
@ -1878,6 +1882,7 @@ public class CompeteService implements ICompeteService { |
|
|
|
//创建行对象
|
|
|
|
List<PoiUtil.PoiUtilCell> title = new ArrayList<>(); |
|
|
|
//给首行单元格赋值
|
|
|
|
title.add(new PoiUtil.PoiUtilCell("序号")); |
|
|
|
title.add(new PoiUtil.PoiUtilCell("组别")); |
|
|
|
title.add(new PoiUtil.PoiUtilCell("参赛单位")); |
|
|
|
title.add(new PoiUtil.PoiUtilCell("姓名")); |
|
|
|