diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 97127509..db7437eb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -146,19 +146,19 @@ public class TableVo { public List getNums(){ List nums = new ArrayList<>(); if(CollectionUtil.isNotEmpty(joinNum)){ - if(certificate == 0){ - joinNum.forEach(joinGroupNum -> { - nums.add(joinGroupNum.getNum()); - }); - }else { - int i = 0; - for(JoinGroupNum joinGroupNum : joinNum){ - if(!"/".equalsIgnoreCase(joinGroupNum.getNum())){ - i += Integer.parseInt(joinGroupNum.getNum()); + if (certificate == 0) { + joinNum.forEach(joinGroupNum -> { + nums.add(joinGroupNum.getNum()); + }); + } else { + int i = 0; + for (JoinGroupNum joinGroupNum : joinNum) { + if (!"/".equalsIgnoreCase(joinGroupNum.getNum())) { + i += Integer.parseInt(joinGroupNum.getNum()); + } } + nums.add(String.valueOf(i)); } - nums.add(String.valueOf(i)); - } } return nums; } diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 5bb8a383..ab453062 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -916,14 +916,14 @@ public class ExcelService implements IExcelService { List competeAllCountList = new ArrayList<>(); if(ObjectUtil.isNotNull(competeTime)){ //查询个人赛的数量统计 -// List nums = competePlayerDao.getJoinNumByType(competeTime.getType()); -// competeAllCountList.addAll(nums); + List nums = competePlayerDao.getJoinNumByType(competeTime.getType()); + competeAllCountList.addAll(nums); //查询限制组别的团体赛的统计 List groupRuleNum = competePlayerDao.getJoinRuleTeamNumByType(competeTime.getType()); competeAllCountList.addAll(groupRuleNum); //查询团体赛的数量统计 -// List groupNum = competePlayerDao.getJoinTeamNumByType(competeTime.getType()); -// competeAllCountList.addAll(groupNum); + List groupNum = competePlayerDao.getJoinTeamNumByType(competeTime.getType()); + competeAllCountList.addAll(groupNum); } CollectionUtil.sort(competeAllCountList,(t1,t2)-> (int)(t1.getProjectId() - t2.getProjectId())); return competeAllCountList;