diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index 8198731d..051b9a19 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -595,4 +595,38 @@ public class CompeteVo {
         @ApiModelProperty("公司")
         private Long companyId;
     }
+    @Data
+    @ApiModel("代表对名单查询用")
+    public static class DaiBiaoDUi {
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("公司名称")
+        private  String companyName;
+        @ApiModelProperty("运动员名称")
+        private String names;
+        @ApiModelProperty("领队or教练")
+        private Byte identity;
+        @ApiModelProperty("领队教练身份")
+        private String name;
+    }
+    @Data
+    @ApiModel("参赛队伍信息表")
+    public static class MesBiao {
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("公司名称")
+        private  String companyName;
+        @ApiModelProperty("运动员名称")
+        private String names;
+        @ApiModelProperty("领队or教练")
+        private String identity;
+        @ApiModelProperty("名称")
+        private String name;
+        @ApiModelProperty("性别")
+        private String gender;
+        @ApiModelProperty("身份证号")
+        private String idCard;
+        @ApiModelProperty("电话号")
+        private String phone;
+    }
 }
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 246c37b5..38ec2a4b 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
@@ -96,4 +96,7 @@ public interface CompeteScoreDao  {
      * @return 成绩
      */
     List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId);
+
+    List<CompeteVo.DaiBiaoDUi> selAllDaiBiaoDui(@Param("identity")  byte  identity);
+    List<CompeteVo.MesBiao> 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 5358d6cc..2dd9abea 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@@ -77,43 +77,43 @@ public class ExcelService implements IExcelService {
     @Resource
     private ICompeteService competeService;
 
+
     @Override
     public String dasaiduiwuxinxiWPS(QueryDto<CompeteDto.CompeteTime> params) {
 
-
-
-
-
-        //这个里面包含联系人得信息
-        List<CompeteCompany> competeCompanyListSel= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId());
-        List<CompeteCompany> competeCompanyList= new ArrayList<>();
-        for (CompeteCompany com:competeCompanyListSel) {
-            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
-            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
-            //运动员list
-            List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
-            List<CompetePlayer> 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<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
-                List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
-                if (competeProjectPlayers.size() > 0 || competeTeamMembers.size() > 0) {
-                    competeCompanyList.add(com);
-                    break;
-                }
-            }
-
-        }
-
-
-        List<CompeteCoach> competeCoachList =new ArrayList<CompeteCoach>();
-        for (CompeteCompany com:competeCompanyList) {
-            //再根据单位id查询，领队和教练信息,返回list集合
-            competeCoachList.addAll(competeCompanyDao.selectByCompanyId(com.getId()));
-        }
+        List<CompeteVo.MesBiao> mesBiaos = competeScoreDao.selCanSaiDuiWuMes();
+//
+//
+//        //这个里面包含联系人得信息
+//        List<CompeteCompany> competeCompanyListSel= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId());
+//        List<CompeteCompany> competeCompanyList= new ArrayList<>();
+//        for (CompeteCompany com:competeCompanyListSel) {
+//            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
+//            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
+//            //运动员list
+//            List<CompetePlayer> 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<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+//                List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                if (competeProjectPlayers.size() > 0 || competeTeamMembers.size() > 0) {
+//                    competeCompanyList.add(com);
+//                    break;
+//                }
+//            }
+//
+//        }
+//
+//
+//        List<CompeteCoach> competeCoachList =new ArrayList<CompeteCoach>();
+//        for (CompeteCompany com:competeCompanyList) {
+//            //再根据单位id查询，领队和教练信息,返回list集合
+//            competeCoachList.addAll(competeCompanyDao.selectByCompanyId(com.getId()));
+//        }
         List<List<PoiUtil.PoiUtilCell>> biao = new ArrayList<>();
         //先把联系人的都添加进去
         List<PoiUtil.PoiUtilCell> biaotou=new ArrayList<>();
@@ -147,69 +147,97 @@ public class ExcelService implements IExcelService {
         beizhuTou.setValue("备注");
         hangTou.add(beizhuTou);
         biao.add(hangTou);
-        int i=1;
-        for(CompeteCompany competeCompany:competeCompanyList){
+        for (int i = 0; i < mesBiaos.size(); i++) {
             List<PoiUtil.PoiUtilCell> hang=new ArrayList<>();
             PoiUtil.PoiUtilCell xuhao=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            xuhao.setValue(String.valueOf(i++));
+            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());
+            cansaiduiwu.setValue(mesBiaos.get(i).getCompanyName());
             hang.add(cansaiduiwu);
             PoiUtil.PoiUtilCell renyuanleibei=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            renyuanleibei.setValue("联系人");
+            renyuanleibei.setValue(mesBiaos.get(i).getIdentity());
             hang.add(renyuanleibei);
             PoiUtil.PoiUtilCell name=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            name.setValue(competeCompany.getContactsName());
+            name.setValue(mesBiaos.get(i).getName());
             hang.add(name);
             PoiUtil.PoiUtilCell sex=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            sex.setValue("/");
+            sex.setValue(mesBiaos.get(i).getGender());
             hang.add(sex);
             PoiUtil.PoiUtilCell pho=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            pho.setValue(String.valueOf(competeCompany.getContactsPhone()));
+            pho.setValue(String.valueOf(mesBiaos.get(i).getPhone()));
             hang.add(pho);
             PoiUtil.PoiUtilCell idCardNum=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1, null, null);
-            idCardNum.setValue("/");
+            idCardNum.setValue(mesBiaos.get(i).getIdCard());
             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<PoiUtil.PoiUtilCell> 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);
-                  }
-            }
         }
+
+//        for(CompeteCompany competeCompany:competeCompanyList){
+//            List<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> 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";
@@ -235,108 +263,164 @@ public class ExcelService implements IExcelService {
 
     @Override
     public String iTeamListService(QueryDto<CompeteDto.CompeteTime> params) {
+
+        List<CompeteVo.DaiBiaoDUi> daiBiaoDUis0 = competeScoreDao.selAllDaiBiaoDui((byte) 0);
+        List<CompeteVo.DaiBiaoDUi> daiBiaoDUis1 = competeScoreDao.selAllDaiBiaoDui((byte) 1);
+
         //查出所有的单位的id
         List<CompeteCompany> competeCompanyList= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId());
+
+
         List<List<PoiUtil.PoiUtilCell>> biao = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> biaoti=new ArrayList<>();
         PoiUtil.PoiUtilCell biaotouName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1, null, null);
         biaotouName.setValue("代表队名单");
         biaoti.add(biaotouName);
         biao.add(biaoti);
-        for (CompeteCompany com:competeCompanyList) {
-            //查出教练和领队的list
-            List<CompeteCoach> jLandLD=competeCompanyDao.selectByCompanyId(com.getId());
-            CompetePlayerExample competePlayerExample=new CompetePlayerExample();
-            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
-            //运动员list
-            List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
-
-            List<CompetePlayer> 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<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
-                 List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
-                 if(competeProjectPlayers.size()>0||competeTeamMembers.size()>0){
-                    competePlayerList1.add(competePlayerList.get(i));
-                 }
-            }
-
+//        for (CompeteCompany com:competeCompanyList) {
+//            //查出教练和领队的list
+//            List<CompeteCoach> jLandLD=competeCompanyDao.selectByCompanyId(com.getId());
+//            CompetePlayerExample competePlayerExample=new CompetePlayerExample();
+//            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
+//            //运动员list
+//            List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
+//
+//            List<CompetePlayer> 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<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+//                 List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                 if(competeProjectPlayers.size()>0||competeTeamMembers.size()>0){
+//                    competePlayerList1.add(competePlayerList.get(i));
+//                 }
+//            }
+//
+//
+//            List<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> 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<PoiUtil.PoiUtilCell> daibiaodui=new ArrayList<>();
             PoiUtil.PoiUtilCell daibiaoduiName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1, null, null);
-            daibiaoduiName.setValue(com.getName());
+            daibiaoduiName.setValue(mes.getCompanyName());
             daibiaodui.add(daibiaoduiName);
             biao.add(daibiaodui);
-            //领队和教练
+
             List<PoiUtil.PoiUtilCell> 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()+'、');
+            PoiUtil.PoiUtilCell lingduiName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            if(mes.getName()!=null){
+               lingduiName.setValue(mes.getName());
+            }
+            lingduiList.add(lingduiName);
+            biao.add(lingduiList);
+
+            List<PoiUtil.PoiUtilCell> jiaolianList=new ArrayList<>();
+            PoiUtil.PoiUtilCell jiaolian=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            jiaolian.setValue("教 练:");
+            jiaolianList.add(jiaolian);
+            PoiUtil.PoiUtilCell jiaolianName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            for (int i = 0; i < daiBiaoDUis1.size(); i++) {
+                if(daiBiaoDUis1.get(i).getId().equals(mes.getId())){
+                    if(daiBiaoDUis1.get(i).getName()!=null){
+                        jiaolianName.setValue(daiBiaoDUis1.get(i).getName());
+                    }
+                    break;
                 }
-            });
-           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<PoiUtil.PoiUtilCell> 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);
             }
+            jiaolianList.add(jiaolianName);
+            biao.add(jiaolianList);
 
             List<PoiUtil.PoiUtilCell> 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);
+            PoiUtil.PoiUtilCell yuandongyuanNames=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            yuandongyuanNames.setValue(mes.getNames());
+            yundongyuanList.add(yuandongyuanNames);
             biao.add(yundongyuanList);
 
             List<PoiUtil.PoiUtilCell> 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);
+        });
+
+        biao.remove(biao.size()-1);
         Workbook workbook = new XSSFWorkbook();
         PoiUtil.exportWB("代表队名单",biao,workbook);
         String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index f1eb223f..77407754 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -723,6 +723,143 @@
         group by s.site_order_id
         order by result desc
     </select>
+    <select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
+            select q.*,identity,GROUP_CONCAT(tcch.name) as name  From
+    (
+    SELECT
+        id,
+        companyName,
+        GROUP_CONCAT( `name` ) AS `names`
+    FROM
+        (
+    SELECT
+        tcc.id,
+        tcc.`name` AS companyName,
+        concat( tcp.NAME, IF ( tcp.gender = 0, '(女)', '(男)' ) ) AS `name`,
+        (
+    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 ) )
+        ),
+        1,
+        0
+        )
+        ) AS `after`
+    FROM
+        t_compete_company tcc
+        LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id
+    WHERE
+        tcc.rec_status = 0
+        AND tcp.rec_status = 0
+        AND tcc.compete_time_id = 1
+        ) t
+    WHERE
+        `after` != 0
+    GROUP BY
+        t.id) q left join t_compete_coach tcch on q.id=tcch.company_id and tcch.rec_status=0 and tcch.identity=#{identity}
+    group by q.id
+    </select>
+    <select id="selCanSaiDuiWuMes" resultType="com.ccsens.mt.bean.vo.CompeteVo$MesBiao">
+
+SELECT
+	*
+FROM
+	(
+SELECT
+	q.*,
+IF
+	( identity = 0, '领队', '教练' ) AS identity,
+	tcch.NAME,
+IF
+	( tcch.gender = 0, '女', '男' ) AS gender,
+	tcch.id_card AS idCard,
+	tcch.phone
+FROM
+	(
+SELECT
+	id,
+	companyName,
+	GROUP_CONCAT( `name` ) AS `names`
+FROM
+	(
+SELECT
+	tcc.id,
+	tcc.`name` AS companyName,
+	concat( tcp.NAME, IF ( tcp.gender = 0, '(女)', '(男)' ) ) AS `name`,
+	(
+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 ) )
+	),
+	1,
+	0
+	)
+	) AS `after`
+FROM
+	t_compete_company tcc
+	LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id
+WHERE
+	tcc.rec_status = 0
+	AND tcp.rec_status = 0
+	AND tcc.compete_time_id = 1
+	) t
+WHERE
+	`after` != 0
+GROUP BY
+	t.id
+	) q
+	LEFT JOIN t_compete_coach tcch ON q.id = tcch.company_id
+	AND tcch.rec_status = 0 UNION
+	(
+SELECT
+	id,
+	companyName,
+	GROUP_CONCAT( `name` ) AS `names`,
+	'联系人' AS identity,
+	contacts_name AS NAME,
+	'/' AS gender,
+	'/' AS idCard,
+	contacts_phone AS phone
+FROM
+	(
+SELECT
+	tcc.id,
+	tcc.`name` AS companyName,
+	tcc.contacts_name,
+	tcc.contacts_phone,
+	concat( tcp.NAME, IF ( tcp.gender = 0, '(女)', '(男)' ) ) AS `name`,
+	(
+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 ) )
+	),
+	1,
+	0
+	)
+	) AS `after`
+FROM
+	t_compete_company tcc
+	LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id
+WHERE
+	tcc.rec_status = 0
+	AND tcp.rec_status = 0
+	AND tcc.compete_time_id = 1
+	) t
+WHERE
+	`after` != 0
+GROUP BY
+	t.id
+	)
+	) tt
+ORDER BY
+	tt.id
+    </select>
 
     <!--<select id="queryEightGroupLimit" resultType="com.ccsens.mt.bean.vo.CompeteExcelVo$BeforeEight">
          select t1.group_name as groupName, GROUP_CONCAT(t1.name) as eightNames from
diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
index a7623fbb..3dcd0872 100644
--- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
@@ -52,17 +52,20 @@
         tt.`cr` as `time`
        FROM
         t_compete_judgment tcj
+        left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id
+
         left join (
         select
          max(created_at) as cr,
          user_id
          From tall.t_sys_log
+
          where `url`='/users/signin' and `rec_status`=0
         <if test="param.signEndTime!=null">
             and  tall.t_sys_log.created_at 	&lt;= #{param.signEndTime,jdbcType=TIMESTAMP}
         </if>
         GROUP BY tall.t_sys_log.user_id
-        ) tt on tt.`user_id`=tcj.`user_id`
+        ) tt on tt.`user_id`=ttpm.`user_id`
         LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id`
         WHERE
         tct.id=#{param.id}
diff --git a/tall/src/main/resources/banner.txt b/tall/src/main/resources/banner.txt
index 0bfe9c38..759c9b00 100644
--- a/tall/src/main/resources/banner.txt
+++ b/tall/src/main/resources/banner.txt
@@ -1,22 +1,21 @@
-/**
- * _ooOoo_
- * o8888888o
- * 88" . "88
- * (| -_- |)
- *  O\ = /O
- * ___/`---'\____
- * .   ' \\| |// `.
- * / \\||| : |||// \
- * / _||||| -:- |||||- \
- * | | \\\ - /// | |
- * | \_| ''\---/'' | |
- * \ .-\__ `-` ___/-. /
- * ___`. .' /--.--\ `. . __
- * ."" '< `.___\_<|>_/___.' >'"".
- * | | : `- \`.;`\ _ /`;.`/ - ` : | |
- * \ \ `-. \_ __\ /__ _/ .-` / /
- * ======`-.____`-.___\_____/___.-`____.-'======
- * `=---='
- *          .............................................
- *           佛曰：bug泛滥，我已瘫痪！
- */
\ No newline at end of file
+//                            _ooOoo_
+//                           o8888888o
+//                           88" . "88
+//                           (| -_- |)
+//                            O\ = /O
+//                        ____/`---'\____
+//                      .   ' \\| |// `.
+//                       / \\||| : |||// \
+//                     / _||||| -:- |||||- \
+//                       | | \\\ - /// | |
+//                     | \_| ''\---/'' | |
+//                      \ .-\__ `-` ___/-. /
+//                   ___`. .' /--.--\ `. . __
+//                ."" '< `.___\_<|>_/___.' >'"".
+//               | | : `- \`.;`\ _ /`;.`/ - ` : | |
+//                 \ \ `-. \_ __\ /__ _/ .-` / /
+//         ======`-.____`-.___\_____/___.-`____.-'======
+//                            `=---='
+//
+//         .............................................
+//                  佛祖保佑             永无BUG
\ No newline at end of file