diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java
index 2955fd3d..de817184 100644
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java
@@ -2,10 +2,13 @@ package com.ccsens.mt.persist.dao;
 
 import com.ccsens.mt.bean.po.CompeteProject;
 import com.ccsens.mt.bean.po.CompeteProjectConfig;
+import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper;
 import com.ccsens.mt.persist.mapper.CompeteProjectMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *
  * @author: li
@@ -13,5 +16,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface CompeteProjectDao extends CompeteProjectMapper {
     CompeteProject getProjectByProjectName(@Param("projectName") String projectId);
+    List<TableVo.CompeteJoin> getPlayerForSingle (@Param("level") Byte level, @Param("type") Byte type);
+    List<TableVo.CompeteJoin> getPlayerForTeam (@Param("level") Byte level, @Param("type") Byte type);
 
 }
\ No newline at end of file
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 1a9ced92..84855e86 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@@ -323,167 +323,187 @@ public class ExcelService implements IExcelService {
     }
 
 
-
-
     private List<TableVo.CompeteJoin> getCompeteJoin(CompeteDto.CompeteTime params) {
         List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
         Long competeTimeId = params.getCompeteTimeId();
         CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
-        int type = competeTime.getType();
+        Byte type = competeTime.getType();
         Byte level = 2;
-        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
-        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
-        //获取参赛项目集合
-        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
-        for (CompeteProject competeProject : competeProjectList) {
-            String projectName = competeProject.getName();
-            if (competeProject.getTeam() == 0) {
-                //如果不是团队项目，查询该项目下报名人数集合
-                CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
-                competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
-                List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
-                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
-                    //查询每个报名人的详细信息下
-                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
-                    if(ObjectUtil.isNotNull(competePlayer)){
+        //个人项目名报名
+        List<TableVo.CompeteJoin> playerForSingleList = competeProjectDao.getPlayerForSingle(level, type);
+        playerForSingleList.forEach(mes->{
+            competeJoinList.add(mes);
+        });
+        //团队项目报名
+        List<TableVo.CompeteJoin> playerForTeamList = competeProjectDao.getPlayerForTeam(level, type);
+        playerForTeamList.forEach(mes->{
+            competeJoinList.add(mes);
+        });
+        return competeJoinList;
+    }
 
-                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                    //姓名
-                    competeJoin.setName(competePlayer.getName());
-                    //身份证号
-                    competeJoin.setIdCard(competePlayer.getIdCard());
-                    //根据身份证获取选手年龄并赋值
-                    String idCard = competeJoin.getIdCard();
-                    int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
-                    competeJoin.setAge(ageByIdCard);
-                    Byte gender = competePlayer.getGender();
-                    if (gender == 0) {
-                        competeJoin.setGender("女");
-                    } else {
-                        competeJoin.setGender("男");
-                    }
-                    //查询单位,并赋值
-                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                    if (ObjectUtil.isNotNull(competeCompany)) {
-                        competeJoin.setJoinTeam(competeCompany.getName());
-                    }
-                    //查询组别，并赋值
-                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                    if (ObjectUtil.isNotNull(competeGroup)) {
-                        competeJoin.setCompeteGroup(competeGroup.getGroupName());
-                    }
-//                    //身份证明查询，并赋值
-//                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-//                    if (ObjectUtil.isNotNull(commonFile)) {
-//                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-//                    }
-//                    //一寸证件照查询赋值
-//                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-//                    if (ObjectUtil.isNotNull(commonFile1)) {
-//                        competeJoin.setPicture(commonFile1.getVisitLocation());
+
+
+//    private List<TableVo.CompeteJoin> getCompeteJoin(CompeteDto.CompeteTime params) {
+//        List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
+//        Long competeTimeId = params.getCompeteTimeId();
+//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
+//        int type = competeTime.getType();
+//        Byte level = 2;
+//        Byte recStatus = 0;
+//        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
+//        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level).andRecStatusEqualTo(recStatus);
+//        //获取参赛项目集合
+//        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
+//        for (CompeteProject competeProject : competeProjectList) {
+//            String projectName = competeProject.getName();
+//            if (competeProject.getTeam() == 0) {
+//                //如果不是团队项目，查询该项目下报名人数集合
+//                CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
+//                competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andRecStatusEqualTo(recStatus);
+//                List<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+//                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
+//                    //查询每个报名人的详细信息下
+//                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
+//                    if(ObjectUtil.isNotNull(competePlayer)){
+//
+//                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                    //姓名
+//                    competeJoin.setName(competePlayer.getName());
+//                    //身份证号
+//                    competeJoin.setIdCard(competePlayer.getIdCard());
+//                    //根据身份证获取选手年龄并赋值
+//                    String idCard = competeJoin.getIdCard();
+//                    int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                    competeJoin.setAge(ageByIdCard);
+//                    Byte gender = competePlayer.getGender();
+//                    if (gender == 0) {
+//                        competeJoin.setGender("女");
+//                    } else {
+//                        competeJoin.setGender("男");
 //                    }
-//                    //学籍证明/俱乐部证明
-//                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-//                    if (ObjectUtil.isNotNull(commonFile2)) {
-//                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                    //查询单位,并赋值
+//                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                    if (ObjectUtil.isNotNull(competeCompany)) {
+//                        competeJoin.setJoinTeam(competeCompany.getName());
 //                    }
-//                    //体检证明
-//                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-//                    if (ObjectUtil.isNotNull(commonFile3)) {
-//                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//                    //查询组别，并赋值
+//                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                    if (ObjectUtil.isNotNull(competeGroup)) {
+//                        competeJoin.setCompeteGroup(competeGroup.getGroupName());
 //                    }
-//                    //人身意外伤害保险证明
-//                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-//                    if (ObjectUtil.isNotNull(commonFile4)) {
-//                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+////                    //身份证明查询，并赋值
+////                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+////                    if (ObjectUtil.isNotNull(commonFile)) {
+////                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+////                    }
+////                    //一寸证件照查询赋值
+////                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+////                    if (ObjectUtil.isNotNull(commonFile1)) {
+////                        competeJoin.setPicture(commonFile1.getVisitLocation());
+////                    }
+////                    //学籍证明/俱乐部证明
+////                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+////                    if (ObjectUtil.isNotNull(commonFile2)) {
+////                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+////                    }
+////                    //体检证明
+////                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+////                    if (ObjectUtil.isNotNull(commonFile3)) {
+////                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
+////                    }
+////                    //人身意外伤害保险证明
+////                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+////                    if (ObjectUtil.isNotNull(commonFile4)) {
+////                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+////                    }
+//                    //参赛项目名赋值
+//                    competeJoin.setCompeteProject(projectName);
+//                    //项目id
+//                    competeJoin.setProjectId(competeProject.getId());
+//                    competeJoinList.add(competeJoin);
 //                    }
-                    //参赛项目名赋值
-                    competeJoin.setCompeteProject(projectName);
-                    //项目id
-                    competeJoin.setProjectId(competeProject.getId());
-                    competeJoinList.add(competeJoin);
-                    }
-                }
-
-            } else { //团队项目
-                //获取参赛队伍集合
-                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
-                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
-                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
-                for (CompeteTeam competeTeam : competeTeamList) {
-                    //获取队伍下的成员集合
-                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
-                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
-                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
-                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
-                        //查询成员详细信息
-                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
-                        if(ObjectUtil.isNotNull(competePlayer)){
-
-                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                        //姓名
-                        competeJoin.setName(competePlayer.getName());
-                        //身份证号
-                        competeJoin.setIdCard(competePlayer.getIdCard());
-                        //根据身份证获取选手年龄并赋值
-                        String idCard = competeJoin.getIdCard();
-                        int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
-                        competeJoin.setAge(ageByIdCard);
-                        //性别
-                        Byte gender = competePlayer.getGender();
-                        if (gender == 0) {
-                            competeJoin.setGender("女");
-                        } else {
-                            competeJoin.setGender("男");
-                        }
-
-                        //查询单位,并赋值
-                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                        if (ObjectUtil.isNotNull(competeCompany)) {
-                            competeJoin.setJoinTeam(competeCompany.getName());
-                        }
-                        //查询组别，并赋值
-                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                        if (ObjectUtil.isNotNull(competeGroup)) {
-                            competeJoin.setCompeteGroup(competePlayer.getName());
-                        }
-//                        //身份证明查询，并赋值
-//                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-//                        if (ObjectUtil.isNotNull(commonFile)){
-//                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-//                        }
-//                        //一寸证件照查询赋值
-//                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-//                        if (ObjectUtil.isNotNull(commonFile1)){
-//                            competeJoin.setPicture(commonFile1.getVisitLocation());
-//                        }
-//                        //学籍证明/俱乐部证明
-//                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-//                        if (ObjectUtil.isNotNull(commonFile2)){
-//                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                }
+//
+//            } else { //团队项目
+//                //获取参赛队伍集合
+//                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
+//                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andRecStatusEqualTo(recStatus);
+//                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
+//                for (CompeteTeam competeTeam : competeTeamList) {
+//                    //获取队伍下的成员集合
+//                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
+//                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+//                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
+//                        //查询成员详细信息
+//                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
+//                        if(ObjectUtil.isNotNull(competePlayer)){
+//
+//                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                        //姓名
+//                        competeJoin.setName(competePlayer.getName());
+//                        //身份证号
+//                        competeJoin.setIdCard(competePlayer.getIdCard());
+//                        //根据身份证获取选手年龄并赋值
+//                        String idCard = competeJoin.getIdCard();
+//                        int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                        competeJoin.setAge(ageByIdCard);
+//                        //性别
+//                        Byte gender = competePlayer.getGender();
+//                        if (gender == 0) {
+//                            competeJoin.setGender("女");
+//                        } else {
+//                            competeJoin.setGender("男");
 //                        }
-//                        //体检证明
-//                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-//                        if (ObjectUtil.isNotNull(commonFile3)){
-//                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//
+//                        //查询单位,并赋值
+//                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                        if (ObjectUtil.isNotNull(competeCompany)) {
+//                            competeJoin.setJoinTeam(competeCompany.getName());
 //                        }
-//                        //人身意外伤害保险证明
-//                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-//                        if (ObjectUtil.isNotNull(commonFile4)){
-//                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+//                        //查询组别，并赋值
+//                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                        if (ObjectUtil.isNotNull(competeGroup)) {
+//                            competeJoin.setCompeteGroup(competePlayer.getName());
 //                        }
-                        //参赛项目名赋值
-                        competeJoin.setCompeteProject(projectName);
-                        //项目id
-                        competeJoin.setProjectId(competeProject.getId());
-                        competeJoinList.add(competeJoin);
-                    }
-                    }
-                }
-            }
-        }
-        return competeJoinList;
-    }
+////                        //身份证明查询，并赋值
+////                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+////                        if (ObjectUtil.isNotNull(commonFile)){
+////                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+////                        }
+////                        //一寸证件照查询赋值
+////                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+////                        if (ObjectUtil.isNotNull(commonFile1)){
+////                            competeJoin.setPicture(commonFile1.getVisitLocation());
+////                        }
+////                        //学籍证明/俱乐部证明
+////                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+////                        if (ObjectUtil.isNotNull(commonFile2)){
+////                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+////                        }
+////                        //体检证明
+////                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+////                        if (ObjectUtil.isNotNull(commonFile3)){
+////                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
+////                        }
+////                        //人身意外伤害保险证明
+////                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+////                        if (ObjectUtil.isNotNull(commonFile4)){
+////                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+////                        }
+//                        //参赛项目名赋值
+//                        competeJoin.setCompeteProject(projectName);
+//                        //项目id
+//                        competeJoin.setProjectId(competeProject.getId());
+//                        competeJoinList.add(competeJoin);
+//                    }
+//                    }
+//                }
+//            }
+//        }
+//        return competeJoinList;
+//    }
 
     private String getExcelFilePathForCompeteJoin(List<TableVo.CompeteJoin> arrayList) throws IOException {
         //创建excle表格对象
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
index 233fac8c..b42730ed 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml
@@ -7,4 +7,58 @@
     where name = #{projectName}
     and rec_status = 0
   </select>
+
+
+  <select id="getPlayerForSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    select
+    tcpro.`name` as competeProject,
+    tcg.group_name as competeGroup,
+    tcc.`name` as joinTeam,
+    tcp.`name` as  name,
+    tcp.gender as gender,
+    tcp.id_card as idCard,
+    (2020 - SUBSTR(tcp.id_card FROM 7 FOR 4)) as age
+    from t_compete_project tcpro
+    LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
+    LEFT JOIN t_compete_player tcp on tcp.id = tcpp.player_id
+    LEFT JOIN t_compete_company tcc on tcc.id= tcp.company_id
+    LEFT JOIN t_compete_group tcg on tcg.id =tcp.compete_group_id
+    WHERE tcpro.`level`=#{level}
+    and tcpro.type = #{type}
+    and tcpro.team = 0
+    and tcpro.rec_status=0
+    and tcpp.rec_status =0
+    and tcp.rec_status=0
+    and tcc.rec_status=0
+    and tcg.rec_status=0
+  </select>
+
+  <select id="getPlayerForTeam" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    SELECT
+    c.id,
+    p.`name` as competeProject,
+    g.`group_name` as competeGroup,
+    c.`name` as joinTeam,
+    pl.`name` as name ,
+    pl.id_card as idCard,
+    if(pl.gender = 1,'男','女') as gender,
+    (2020 - SUBSTR(pl.id_card FROM 7 FOR 4)) as age
+    FROM
+    t_compete_project p
+    LEFT JOIN t_compete_team t on p.id = t.project_id
+    LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
+    LEFT JOIN t_compete_company c on t.company_id = c.id
+    LEFT JOIN t_compete_player pl on m.player_id = pl.id
+    LEFT JOIN t_compete_group g on t.gender_group = g.sex and t.group_remark = g.group_remark
+    WHERE
+    p.type =  #{type}
+    and p.`level` = #{level}
+    and p.team = 1
+    and p.rec_status = 0
+    and m.rec_status = 0
+    and t.rec_status = 0
+    and pl.rec_status = 0
+    and g.rec_status = 0
+    and c.rec_status = 0
+  </select>
 </mapper>
\ No newline at end of file