20201125v1.5

mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java

@@ -146,19 +146,19 @@ public class TableVo {
         public List<String> getNums(){
             List<String> 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;
         }

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -916,14 +916,14 @@ public class ExcelService implements IExcelService {
         List<TableVo.CompeteAllCount1> competeAllCountList = new ArrayList<>();
         if(ObjectUtil.isNotNull(competeTime)){
             //查询个人赛的数量统计
-//            List<TableVo.CompeteAllCount1> nums = competePlayerDao.getJoinNumByType(competeTime.getType());
-//            competeAllCountList.addAll(nums);
+            List<TableVo.CompeteAllCount1> nums = competePlayerDao.getJoinNumByType(competeTime.getType());
+            competeAllCountList.addAll(nums);
             //查询限制组别的团体赛的统计
             List<TableVo.CompeteAllCount1> groupRuleNum = competePlayerDao.getJoinRuleTeamNumByType(competeTime.getType());
             competeAllCountList.addAll(groupRuleNum);
             //查询团体赛的数量统计
-//            List<TableVo.CompeteAllCount1> groupNum = competePlayerDao.getJoinTeamNumByType(competeTime.getType());
-//            competeAllCountList.addAll(groupNum);
+            List<TableVo.CompeteAllCount1> groupNum = competePlayerDao.getJoinTeamNumByType(competeTime.getType());
+            competeAllCountList.addAll(groupNum);
         }
         CollectionUtil.sort(competeAllCountList,(t1,t2)-> (int)(t1.getProjectId() - t2.getProjectId()));
         return competeAllCountList;