From c32326aa81c6ae6a4ce3e0a067a7617201458f50 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 7 Nov 2020 23:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E7=BB=84?= =?UTF-8?q?=E5=88=AB=E5=88=86=E5=88=AB=E5=8F=82=E8=B5=9B=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/DebugController.java | 5 +- .../java/com/ccsens/mt/bean/vo/TableVo.java | 80 ++++++++++++------- .../mt/persist/dao/CompetePlayerDao.java | 5 ++ .../com/ccsens/mt/service/ExcelService.java | 70 ++++++++-------- .../resources/mapper_dao/CompetePlayerDao.xml | 57 +++++++++++++ 5 files changed, 151 insertions(+), 66 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/DebugController.java b/mt/src/main/java/com/ccsens/mt/api/DebugController.java index 05b970a4..820954af 100644 --- a/mt/src/main/java/com/ccsens/mt/api/DebugController.java +++ b/mt/src/main/java/com/ccsens/mt/api/DebugController.java @@ -4,6 +4,7 @@ import com.ccsens.mt.bean.dto.LevelDto; import com.ccsens.mt.bean.po.CompetePlayer; import com.ccsens.mt.bean.po.LevelUser; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.CompetePlayerDao; import com.ccsens.mt.service.ILevelUpService; import com.ccsens.util.JsonResponse; @@ -73,8 +74,8 @@ public class DebugController { }) @RequestMapping(value="/file",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) public JsonResponse debug() throws Exception { - - return JsonResponse.newInstance().ok(); + List competeAllCount = competePlayerDao.getTeamJoinNumByType(1L); + return JsonResponse.newInstance().ok(competeAllCount); } } 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 9d921137..0cfcf459 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 @@ -1,10 +1,14 @@ package com.ccsens.mt.bean.vo; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @author li */ @@ -30,7 +34,7 @@ public class TableVo { @ApiModelProperty("一寸证件照") private String picture; @ApiModelProperty("学籍证明/俱乐部证明") - private String StudentPromise; + private String studentPromise; @ApiModelProperty("体检证明") private String bodyTest; @ApiModelProperty("人身意外伤害保险证明") @@ -56,40 +60,54 @@ public class TableVo { } +// @Data +// @ApiModel("XXX比赛报名汇总表") +// public static class CompeteAllCount{ +// @ApiModelProperty("参赛项目") +// private String projectName; +// @ApiModelProperty("小学男子组") +// private int primaryMale; +// @ApiModelProperty("小学女子组") +// private int primaryFemale; +// @ApiModelProperty("小学混合组") +// private int primary; +// @ApiModelProperty("中学男子组") +// private int middleMale; +// @ApiModelProperty("中学女子组") +// private int middleFemale; +// @ApiModelProperty("中学混合组") +// private int middle; +// @ApiModelProperty("高职院校男子组") +// private int highMale; +// @ApiModelProperty("高职院校女子组") +// private int highFemale; +// @ApiModelProperty("高职院校混合组") +// private int high; +// @ApiModelProperty("本科院校男子组") +// private int collegeMale; +// @ApiModelProperty("本科院校女子组") +// private int collegeFemale; +// @ApiModelProperty("本科院校混合组") +// private int college; +// @ApiModelProperty("俱乐部男子组（14岁及以下）") +// private int clubMale; +// @ApiModelProperty("俱乐部女子组（14岁及以下）") +// private int clubFemale; +// @ApiModelProperty("俱乐部混合组（14岁及以下）") +// private int club; +// } + + @Data @ApiModel("XXX比赛报名汇总表") + @JsonIgnoreProperties(value = { "handler" }) public static class CompeteAllCount{ + @ApiModelProperty("参赛id") + private String projectId; @ApiModelProperty("参赛项目") private String projectName; - @ApiModelProperty("小学男子组") - private int primaryMale; - @ApiModelProperty("小学女子组") - private int primaryFemale; - @ApiModelProperty("小学混合组") - private int primary; - @ApiModelProperty("中学男子组") - private int middleMale; - @ApiModelProperty("中学女子组") - private int middleFemale; - @ApiModelProperty("中学混合组") - private int middle; - @ApiModelProperty("高职院校男子组") - private int highMale; - @ApiModelProperty("高职院校女子组") - private int highFemale; - @ApiModelProperty("高职院校混合组") - private int high; - @ApiModelProperty("本科院校男子组") - private int collegeMale; - @ApiModelProperty("本科院校女子组") - private int collegeFemale; - @ApiModelProperty("本科院校混合组") - private int college; - @ApiModelProperty("俱乐部男子组（14岁及以下）") - private int clubMale; - @ApiModelProperty("俱乐部女子组（14岁及以下）") - private int clubFemale; - @ApiModelProperty("俱乐部混合组（14岁及以下）") - private int club; + @ApiModelProperty("参赛人数 顺序：小学(女男混)→中学(女男混)→高职院校(女男混)→本科院校(女男混)→俱乐部(女男混)") + private List nums = new ArrayList<>(); } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index 0441abb4..da4a55c4 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java @@ -2,6 +2,7 @@ package com.ccsens.mt.persist.dao; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.mapper.CompetePlayerMapper; import org.apache.ibatis.annotations.Param; @@ -67,4 +68,8 @@ public interface CompetePlayerDao extends CompetePlayerMapper { * @return 返回性别组和备注 */ ProvinceCompeteVo.TeamGroupRemark getTeamGroupRemark(@Param("teamId")Long teamId); + + List getTeamJoinNumByType(@Param("timeId")Long timeId); + + List getTeamJoinNumByProjectId(@Param("projectId")Long projectId); } 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 bbe664c6..552d94d3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -8,9 +8,11 @@ import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; +import com.ccsens.util.CodeEnum; import com.ccsens.util.PoiUtil; import com.ccsens.util.PropUtil; import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -392,41 +394,43 @@ public class ExcelService implements IExcelService { return null; } - private List competeAllCountList(CompeteDto.CompeteTime params){ - //根据大赛查类型 - Long competeTimeId = params.getCompeteTimeId(); - CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); - int type = competeTime.getType(); - Byte level = 2; - CompeteProjectExample competeProjectExample = new CompeteProjectExample(); - competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level); - //获取参赛项目集合 - List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); - CompeteGroupExample competeGroupExample = new CompeteGroupExample(); - competeGroupExample.createCriteria().andTypeEqualTo((byte) type); - //获取组别集合 - List competeGroupList = competeGroupMapper.selectByExample(competeGroupExample); - for (CompeteProject competeProject : competeProjectList){ - //若不是团队项目 - if (competeProject.getTeam() == 0){ - TableVo.CompeteAllCount competeAllCount = new TableVo.CompeteAllCount(); - //项目名赋值 - competeAllCount.setProjectName(competeProject.getName()); - //遍历组别集合 - int i = 0; - for(CompeteGroup competeGroup : competeGroupList){ - CompetePlayerExample competePlayerExample = new CompetePlayerExample(); - competePlayerExample.createCriteria().andCompeteGroupIdEqualTo(competeGroup.getId()); - //计算每个组别人数 - long count = competePlayerDao.countByExample(competePlayerExample); - } - } - } - return null; - } - +// private List competeAllCountList(CompeteDto.CompeteTime params){ +// //根据大赛查类型 +// Long competeTimeId = params.getCompeteTimeId(); +// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); +// int type = competeTime.getType(); +// Byte level = 2; +// CompeteProjectExample competeProjectExample = new CompeteProjectExample(); +// competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level); +// //获取参赛项目集合 +// List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); +// CompeteGroupExample competeGroupExample = new CompeteGroupExample(); +// competeGroupExample.createCriteria().andTypeEqualTo((byte) type); +// //获取组别集合 +// List competeGroupList = competeGroupMapper.selectByExample(competeGroupExample); +// for (CompeteProject competeProject : competeProjectList){ +// //若不是团队项目 +// if (competeProject.getTeam() == 0){ +// TableVo.CompeteAllCount competeAllCount = new TableVo.CompeteAllCount(); +// //项目名赋值 +// competeAllCount.setProjectName(competeProject.getName()); +// //遍历组别集合 +// int i = 0; +// for(CompeteGroup competeGroup : competeGroupList){ +// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); +// competePlayerExample.createCriteria().andCompeteGroupIdEqualTo(competeGroup.getId()); +// //计算每个组别人数 +// long count = competePlayerDao.countByExample(competePlayerExample); +// } +// } +// } +// return null; +// } + private List competeAllCountList(CompeteDto.CompeteTime params){ + return competePlayerDao.getTeamJoinNumByType(params.getCompeteTimeId()); + } } diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 60e2cc41..aff7340a 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -24,6 +24,13 @@ + + + + + + + + + + \ No newline at end of file