diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index e2671074..455ac85c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -129,7 +129,7 @@ public class CompeteScoreController { @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); -// competeService.submitScore(params.getParam()); + competeService.submitScore(params.getParam()); competeScoreService.submitScore(params.getParam()); return JsonResponse.newInstance().ok(); } diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 8d64a343..c09e9d95 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -75,7 +75,6 @@ public class ExcelController { return JsonResponse.newInstance().ok(path); } - @MustLogin @ApiOperation(value = "大赛参赛队伍信息表", notes = "") @RequestMapping(value = "/competitionTeamInformationTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 9c27abdd..45ca8e90 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -6,6 +6,7 @@ import com.ccsens.mt.bean.po.CompeteCompany; import com.ccsens.mt.bean.vo.CompeteExcelVo; 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.CompeteCompanyMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -152,4 +153,13 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return */ int selectJoinNumByPlayer(@Param("playerId")Long playerId, @Param("competeTimeId")Long competeTimeId); + + /** + * 参赛人数统计表 + * @param competeTimeId + * @return 参赛人数 + */ + List selectCompeteJoinCountList(@Param("competeTimeId")Long competeTimeId); + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java index 302b3a7a..4f880607 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteScoreService.java @@ -25,7 +25,6 @@ public class CompeteScoreService implements ICompeteScoreService{ private CompeteCountScoreMapper competeCountScoreMapper; @Resource private Snowflake snowflake; - @Override public void submitScore(CompeteDto.SubmitScore param) { //查找该场次已经有的分数 diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 205e2909..b1b0847f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1409,7 +1409,6 @@ public class CompeteService implements ICompeteService { @Override public List countScoreCurrentSite(CompeteDto.CompeteSite params) { - Long siteId = params.getSiteId(); List countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId); countScoreCurrentSites.forEach(mes->{ 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 83f86189..1b00e004 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -22,6 +22,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Table; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.eclipse.jetty.util.StringUtil; @@ -39,6 +40,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; +import java.util.LinkedList; import java.util.List; @Slf4j @@ -632,38 +634,58 @@ public class ExcelService implements IExcelService { } private List competeJoinCountList(CompeteDto.CompeteTime params) { - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getCompeteTimeId()); - //根据大赛id查公司集合 - List competeCompanyList = competeCompanyMapper.selectByExample(competeCompanyExample); - List competeOverview2List = new ArrayList<>(); - for (CompeteCompany competeCompany : competeCompanyList) { - //每个公司的教练数量 - int leader = 1; - int coach = 0; - CompeteCoachExample competeCoachExample = new CompeteCoachExample(); - competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); - competeCoachMapper.selectByExample(competeCoachExample); - long count = competeCoachMapper.countByExample(competeCoachExample); - //每个公司的领队数量 - CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); - competeCoachExample1.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) leader); - long count1 = competeCoachMapper.countByExample(competeCoachExample1); - //每个公司运动员人数 - CompetePlayerExample competePlayerExample2 = new CompetePlayerExample(); - competePlayerExample2.createCriteria().andCompanyIdEqualTo(competeCompany.getId()); - long count2 = competePlayerDao.countByExample(competePlayerExample2); - //总人数 - long sum = count + count1 + count2; - TableVo.CompeteOverview CompeteOverview2 = new TableVo.CompeteOverview(); - CompeteOverview2.setCompanyName(competeCompany.getName()); - CompeteOverview2.setCoachNum((int) count); - CompeteOverview2.setGuideNum((int) count1); - CompeteOverview2.setPlayerNum((int) count2); - CompeteOverview2.setSum((int) sum); - competeOverview2List.add(CompeteOverview2); + List competeOverviewList = competeCompanyDao.selectCompeteJoinCountList(params.getCompeteTimeId()); + List list = new LinkedList<>(); + for (TableVo.CompeteOverview mes : competeOverviewList){ + if (mes.getCoachNum() != 0 && mes.getGuideNum() != 0 && mes.getPlayerNum() != 0){ + int num = mes.getCoachNum()+mes.getPlayerNum()+mes.getGuideNum(); + mes.setSum(num); + list.add(mes); + } + } - return competeOverview2List; + return list; + + + +// CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); +// competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getCompeteTimeId()); +// //根据大赛id查公司集合 +// List competeCompanyList = competeCompanyMapper.selectByExample(competeCompanyExample); +// List competeOverview2List = new ArrayList<>(); +// for (CompeteCompany competeCompany : competeCompanyList) { +// //每个公司的教练数量 +// int leader = 1; +// int coach = 0; +// CompeteCoachExample competeCoachExample = new CompeteCoachExample(); +// competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); +// competeCoachMapper.selectByExample(competeCoachExample); +// long count = competeCoachMapper.countByExample(competeCoachExample); +// //每个公司的领队数量 +// CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); +// competeCoachExample1.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) leader); +// long count1 = competeCoachMapper.countByExample(competeCoachExample1); +// //每个公司运动员人数 +// CompetePlayerExample competePlayerExample2 = new CompetePlayerExample(); +// competePlayerExample2.createCriteria().andCompanyIdEqualTo(competeCompany.getId()); +// long count2 = competePlayerDao.countByExample(competePlayerExample2); +// List competePlayerList = competePlayerDao.selectByExample(competePlayerExample2); +// competePlayerList.forEach(mes->{ +// CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); +// competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); +// +// }); +// //总人数 +// long sum = count + count1 + count2; +// TableVo.CompeteOverview CompeteOverview2 = new TableVo.CompeteOverview(); +// CompeteOverview2.setCompanyName(competeCompany.getName()); +// CompeteOverview2.setCoachNum((int) count); +// CompeteOverview2.setGuideNum((int) count1); +// CompeteOverview2.setPlayerNum((int) count2); +// CompeteOverview2.setSum((int) sum); +// competeOverview2List.add(CompeteOverview2); +// } +// return competeOverview2List; } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 91ab5fab..bea9e374 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -398,4 +398,18 @@ and pp.rec_status = 0 and p.rec_status = 0 + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index faa4233c..9b81fac3 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -100,6 +100,7 @@ LEFT JOIN t_compete_company c on p.company_id = c.id WHERE so.id = #{siteId} + and cs.rec_status = 0 and so.rec_status = 0 and cp.rec_status = 0 and pp.rec_status = 0