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 0619f216..918bb453 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -184,99 +184,6 @@ public class ExcelService implements IExcelService { biaotouName.setValue("代表队名单"); biaoti.add(biaotouName); biao.add(biaoti); -// for (CompeteCompany com:competeCompanyList) { -// //查出教练和领队的list -// List jLandLD=competeCompanyDao.selectByCompanyId(com.getId()); -// 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 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()); -// daibiaodui.add(daibiaoduiName); -// biao.add(daibiaodui); -// //领队和教练 -// List lingduiList=new ArrayList<>(); -// PoiUtil.PoiUtilCell lingdui=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// lingdui.setValue("领 队:"); -// lingduiList.add(lingdui); -// -// StringBuffer lingduiName=new StringBuffer(""); -// StringBuffer jiaolianName=new StringBuffer(""); -// jLandLD.forEach(jLD->{ -// if (jLD.getIdentity().equals((byte) 0)) { -// lingduiName.append(jLD.getName()+'、'); -// } else { -// jiaolianName.append(jLD.getName()+'、'); -// } -// }); -// if(lingduiName.length()>0){ -// lingduiName.deleteCharAt(lingduiName.length() - 1) ; -// } -// if(jiaolianName.length()>0){ -// jiaolianName.deleteCharAt(jiaolianName.length() - 1) ; -// } -// PoiUtil.PoiUtilCell lingduiNameHang=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// lingduiNameHang.setValue(String.valueOf(lingduiName)); -// lingduiList.add(lingduiNameHang); -// -// biao.add(lingduiList); -// List jiaolianList=new ArrayList<>(); -// PoiUtil.PoiUtilCell jiaoling=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// jiaoling.setValue("教 练:"); -// jiaolianList.add(jiaoling); -// PoiUtil.PoiUtilCell jiaolianHang= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// jiaolianHang.setValue(String.valueOf(jiaolianName)); -// jiaolianList.add(jiaolianHang); -// biao.add(jiaolianList); -// //再放运动员 -// StringBuffer yDYLN=new StringBuffer(""); -// competePlayerList1.forEach(cpL->{ -// yDYLN.append(cpL.getName()); -// yDYLN.append("("); -// yDYLN.append(cpL.getGender().equals((byte) 0)?"女":"男"); -// yDYLN.append(")、"); -// }); -// if (yDYLN.length()>0){ -// yDYLN.deleteCharAt(yDYLN.length()-1); -// } -// -// List yundongyuanList=new ArrayList<>(); -// PoiUtil.PoiUtilCell yuandongyuan=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// yuandongyuan.setValue("运动员"); -// yundongyuanList.add(yuandongyuan); -// PoiUtil.PoiUtilCell yuandongyuanName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); -// yuandongyuanName.setValue(String.valueOf(yDYLN)); -// yundongyuanList.add(yuandongyuanName); -// biao.add(yundongyuanList); -// -// 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); -// } -// } -// } daiBiaoDUis0.forEach(mes->{ List daibiaodui=new ArrayList<>(); diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 5bde88b5..20c382f7 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -742,8 +742,8 @@ IF ( ( - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0) ) + OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) ), 1, 0 @@ -794,8 +794,8 @@ IF ( ( - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0 ) ) + OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) ), 1, 0 @@ -838,8 +838,8 @@ IF ( ( - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0 ) ) + OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) ), 1, 0