From 1997e1f5aa216d12e5132cb546018c645080d1e4 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Tue, 24 Nov 2020 10:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E7=BB=84=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ExcelController.java | 4 +- .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 7 +++ .../com/ccsens/mt/service/ExcelService.java | 58 +++++++++++++++++-- .../com/ccsens/mt/service/IExcelService.java | 4 +- 4 files changed, 65 insertions(+), 8 deletions(-) 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 8fff9c05..8d64a343 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -147,7 +147,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715") @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { log.info("参赛人数统计表：{}",params); String path = excelService.patternExpTable(params.getParam()); return JsonResponse.newInstance().ok(path); @@ -155,7 +155,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "计数赛成绩导出（导出）", notes = "100715") @RequestMapping(value = "/countExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto params) { log.info("参赛人数统计表：{}",params); String path = excelService.countExpTable(params.getParam()); return JsonResponse.newInstance().ok(path); diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index f42b7873..2379572d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -168,4 +168,11 @@ public class ScoreDto { @Max(value=100) private int pageSize = 10; } + @Data + @ApiModel + public static class ShowResultNoPage { + @NotNull + @ApiModelProperty("项目id") + private 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 daf0577c..5358d6cc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -63,6 +63,8 @@ public class ExcelService implements IExcelService { private CompeteProjectPlayerMapper competeProjectPlayerMapper; @Resource private CompeteCoachMapper competeCoachMapper; + @Resource + private CompeteTeamMemberMapper competeTeamMemberMapper; @Resource private CompetePlayerMapper competePlayerMapper; @@ -77,8 +79,36 @@ public class ExcelService implements IExcelService { @Override public String dasaiduiwuxinxiWPS(QueryDto params) { + + + + + //这个里面包含联系人得信息 - List competeCompanyList= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId()); + 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); + List competePlayerList1=new ArrayList<>(); + 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集合 @@ -221,6 +251,20 @@ public class ExcelService implements IExcelService { //运动员list List competePlayerList = competePlayerMapper.selectByExample(competePlayerExample); + List competePlayerList1=new ArrayList<>(); + for(int i=0;i competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); + List competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); + if(competeProjectPlayers.size()>0||competeTeamMembers.size()>0){ + competePlayerList1.add(competePlayerList.get(i)); + } + } + + List daibiaodui=new ArrayList<>(); PoiUtil.PoiUtilCell daibiaoduiName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1, null, null); daibiaoduiName.setValue(com.getName()); @@ -262,7 +306,7 @@ public class ExcelService implements IExcelService { biao.add(jiaolianList); //再放运动员 StringBuffer yDYLN=new StringBuffer(""); - competePlayerList.forEach(cpL->{ + competePlayerList1.forEach(cpL->{ yDYLN.append(cpL.getName()); yDYLN.append("("); yDYLN.append(cpL.getGender().equals((byte) 0)?"女":"男"); @@ -284,7 +328,13 @@ public class ExcelService implements IExcelService { List entryList=new ArrayList<>(); PoiUtil.PoiUtilCell enter= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1); entryList.add(enter); + biao.add(entryList); + if(competePlayerList1.size()<=0){ + for (int i = 0; i < 5; i++) { + biao.remove(biao.size()-1); + } + } } biao.remove(biaoti.size()-1); Workbook workbook = new XSSFWorkbook(); @@ -1333,7 +1383,7 @@ public class ExcelService implements IExcelService { @Override - public String patternExpTable(ScoreDto.ShowResultW param) { + public String patternExpTable(ScoreDto.ShowResultNoPage param) { //List totalScoreDisplays = competeService.showResultPage(param); List totalScoreDisplays = competeScoreDao.queryVarietyScore(param.getProjectId()); List> list = new ArrayList<>(); @@ -1496,7 +1546,7 @@ public class ExcelService implements IExcelService { } @Override - public String countExpTable(ScoreDto.ShowResult param) { + public String countExpTable(ScoreDto.ShowResultNoPage param) { log.info("计数赛成绩公示：{}", param); diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index 2234cef1..60acdb3a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -102,8 +102,8 @@ public interface IExcelService { */ String beforeEight(QueryDto params); - String patternExpTable(ScoreDto.ShowResultW param); + String patternExpTable(ScoreDto.ShowResultNoPage param); - String countExpTable(ScoreDto.ShowResult param); + String countExpTable(ScoreDto.ShowResultNoPage param); }