From ed45109d8ccb0df99a02f3a108b8aeb06d10e89e Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 24 Nov 2020 19:00:41 +0800 Subject: [PATCH] 20201124v1.8 --- .../mt/persist/dao/CompeteScoreDao.java | 5 + .../com/ccsens/mt/service/ExcelService.java | 143 +------------ .../resources/mapper_dao/CompeteScoreDao.xml | 192 +++++++++--------- 3 files changed, 104 insertions(+), 236 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 38ec2a4b..98dbefd7 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -98,5 +98,10 @@ public interface CompeteScoreDao { List queryVarietyScore(@Param("projectId") Long projectId); List selAllDaiBiaoDui(@Param("identity") byte identity); + + /** + * 查询参赛队伍信息（导出表格用） + * @return + */ List selCanSaiDuiWuMes(); } 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 1472023a..0718cbff 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -82,38 +82,7 @@ public class ExcelService implements IExcelService { public String dasaiduiwuxinxiWPS(QueryDto params) { List mesBiaos = competeScoreDao.selCanSaiDuiWuMes(); -// -// -// //这个里面包含联系人得信息 -// List competeCompanyListSel= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId()); -// List competeCompanyList= new ArrayList<>(); -// for (CompeteCompany com:competeCompanyListSel) { -// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); -// competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0); -// //运动员list -// List competePlayerList = competePlayerMapper.selectByExample(competePlayerExample); -// -// for (int i = 0; i < competePlayerList.size(); i++) { -// CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); -// CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); -// competeProjectPlayerExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte) 0); -// competeTeamMemberExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte) 0); -// List competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); -// List competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); -// if (competeProjectPlayers.size() > 0 || competeTeamMembers.size() > 0) { -// competeCompanyList.add(com); -// break; -// } -// } -// -// } -// -// -// List competeCoachList =new ArrayList(); -// for (CompeteCompany com:competeCompanyList) { -// //再根据单位id查询，领队和教练信息,返回list集合 -// competeCoachList.addAll(competeCompanyDao.selectByCompanyId(com.getId())); -// } + List> biao = new ArrayList<>(); //先把联系人的都添加进去 List biaotou=new ArrayList<>(); @@ -176,68 +145,6 @@ public class ExcelService implements IExcelService { biao.add(hang); } -// for(CompeteCompany competeCompany:competeCompanyList){ -// List hang=new ArrayList<>(); -// PoiUtil.PoiUtilCell xuhao=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// xuhao.setValue(String.valueOf(i++)); -// hang.add(xuhao); -// PoiUtil.PoiUtilCell cansaiduiwu=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// cansaiduiwu.setValue(competeCompany.getName()); -// hang.add(cansaiduiwu); -// PoiUtil.PoiUtilCell renyuanleibei=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// renyuanleibei.setValue("联系人"); -// hang.add(renyuanleibei); -// PoiUtil.PoiUtilCell name=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// name.setValue(competeCompany.getContactsName()); -// hang.add(name); -// PoiUtil.PoiUtilCell sex=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// sex.setValue("/"); -// hang.add(sex); -// PoiUtil.PoiUtilCell pho=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// pho.setValue(String.valueOf(competeCompany.getContactsPhone())); -// hang.add(pho); -// PoiUtil.PoiUtilCell idCardNum=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// idCardNum.setValue("/"); -// hang.add(idCardNum); -// PoiUtil.PoiUtilCell beizhu=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// beizhu.setValue("无"); -// hang.add(beizhu); -// biao.add(hang); -// for (CompeteCoach competeCoach:competeCoachList){ -// if(competeCoach.getCompanyId().equals(competeCompany.getId())){ -// List hanghou=new ArrayList<>(); -// PoiUtil.PoiUtilCell xuhaoCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// xuhaoCach.setValue(String.valueOf(i++)); -// hanghou.add(xuhaoCach); -// PoiUtil.PoiUtilCell cansaiduiwuCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// cansaiduiwuCach.setValue(competeCompany.getName()); -// hanghou.add(cansaiduiwuCach); -// PoiUtil.PoiUtilCell renyuanleibeiCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// if (competeCoach.getIdentity().equals((byte) 0)){ -// renyuanleibeiCach.setValue("领队"); -// }else { -// renyuanleibeiCach.setValue("教练"); -// } -// hanghou.add(renyuanleibeiCach); -// PoiUtil.PoiUtilCell nameCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// nameCach.setValue(competeCoach.getName()); -// hanghou.add(nameCach); -// PoiUtil.PoiUtilCell sexCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// sexCach.setValue(competeCoach.getGender().equals((byte) 0)?"女":"男"); -// hanghou.add(sexCach); -// PoiUtil.PoiUtilCell phoCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// phoCach.setValue(String.valueOf(competeCoach.getPhone())); -// hanghou.add(phoCach); -// PoiUtil.PoiUtilCell idCardNumCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// idCardNumCach.setValue(String.valueOf(competeCoach.getIdPhoto())); -// hanghou.add(idCardNumCach); -// PoiUtil.PoiUtilCell beizhuCach=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null); -// beizhuCach.setValue("无"); -// hanghou.add(beizhuCach); -// biao.add(hanghou); -// } -// } -// } Workbook workbook = new XSSFWorkbook(); PoiUtil.exportWB("参赛队伍信息表",biao,workbook); //String name = "跳绳比赛报名人数统计表" + ".xlsx"; @@ -713,8 +620,7 @@ public class ExcelService implements IExcelService { public String competeJoinCount(CompeteDto.CompeteTime params) throws IOException { List competeOverviewList = competeJoinCountList(params); - String path = getExcelFilePathForCompeteJoinCount(competeOverviewList); - return path; + return getExcelFilePathForCompeteJoinCount(competeOverviewList); } private List competeJoinCountList(CompeteDto.CompeteTime params) { @@ -729,47 +635,6 @@ public class ExcelService implements IExcelService { } 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; } @@ -829,10 +694,8 @@ public class ExcelService implements IExcelService { @Override public String competeAllCount(CompeteDto.CompeteTime params) throws IOException { -// List competeAllCountList = competeAllCountList(params); List competeAllCountList = competeAllCountList1(params.getCompeteTimeId()); - String path = getExcelFilePathForCompeteAllCount(competeAllCountList); - return path; + return getExcelFilePathForCompeteAllCount(competeAllCountList); } /** diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 17d3fe21..c060d25d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -765,102 +765,102 @@