From 082b01b63937ee6ce0fc8f97410f812c1ea7eb0c Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Fri, 20 Nov 2020 17:56:28 +0800
Subject: [PATCH 1/2] 11-19-3

---
 .../com/ccsens/mt/bean/dto/CompeteDto.java    |   3 -
 .../persist/dao/CompeteProjectConfigDao.java  |   4 +-
 .../com/ccsens/mt/service/ExcelService.java   |  14 +-
 mt/src/main/resources/application.yml         |   4 +-
 .../mapper_dao/CompeteProjectConfigDao.xml    | 154 +++++++++---------
 5 files changed, 83 insertions(+), 96 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
index 5e577495..fb9955ed 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
@@ -320,9 +320,6 @@ public class CompeteDto {
     @Data
     @ApiModel
     public static class EnterInfo{
-        @NotNull
-        @ApiModelProperty("第几届信息的id")
-        private Long competeTimeId;
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("组别id")
diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
index 8d50f6ef..7edf2578 100644
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
@@ -17,8 +17,8 @@ import java.util.List;
 public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
     CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
     List<TableVo.SchedulePlanDetail> selectDetail ();
-    List<TableVo.CompeteJoin> selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
-    List<TableVo.CompeteJoin> selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
+    List<TableVo.CompeteJoin> selectSingle (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
+    List<TableVo.CompeteJoin> selectGroup (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
     CompeteProjectConfig selectStartTime(@Param("projectId") 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 84855e86..9807c02e 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@@ -1145,23 +1145,13 @@ public class ExcelService implements IExcelService {
     public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
           List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
           //个人项目查询
-          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
           for (TableVo.CompeteJoin competeJoin : competeJoinList1){
-              //获取身份证
-              String idCard = competeJoin.getIdCard();
-              //根据身份证获取选手年龄并赋值
-              int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
-              competeJoin.setAge(ageByIdCard);
               competeJoinList.add(competeJoin);
           }
           //团队项目查询
-          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
           for (TableVo.CompeteJoin competeJoin : competeJoinList2){
-              //获取身份证
-              String idCard = competeJoin.getIdCard();
-              //根据身份证获取选手年龄并赋值
-              int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
-              competeJoin.setAge(ageByIdCard);
               competeJoinList.add(competeJoin);
           }
 //        Long competeTimeId = params.getCompeteTimeId();
diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml
index f59084b0..4ecd13fd 100644
--- a/mt/src/main/resources/application.yml
+++ b/mt/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev
 
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index f91a50a9..f097e789 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -81,79 +81,76 @@
   </select>
 
   <select id="selectSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
-    SELECT
-    tcpro.id as projectId,
-    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,
-    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
-    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
-    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
-    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
-    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
-    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
-    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 tcpp.player_id = tcp.id
-    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
-    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
-    LEFT JOIN t_compete_time tct on tct.type = tcpro.type
-    where
-    <if test="competeTimeId != null">
-       tct.id = #{competeTimeId}
-    </if>
-    <if test="projectId != null">
-      and tcpro.id = #{projectId}
-    </if>
-    <if test="groupId != null">
-      and tcg.id = #{groupId}
-    </if>
-    <if test="companyId != null">
-      and tcc.id = #{companyId}
-    </if>
-    <if test="name != null and name != ''">
-      and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%')
-    </if>
-    <if test="idCard != null and idCard != ''">
-      and tcp.id_card = #{idCard}
-    </if>
-    and tcp.rec_status = 0
-    and tcc.rec_status = 0
-    and tcpp.rec_status = 0
-    and tcpro.rec_status = 0
-    and tct.rec_status = 0
+      SELECT
+      tcpro.id as projectId,
+      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,
+      (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+      (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+      (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+      (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+      (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+      (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+      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 tcpp.player_id = tcp.id
+      LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+      LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+      where
+      <trim prefix="(" prefixOverrides="and" suffix=")">
+          <if test="projectId != null">
+              tcpro.id = #{projectId}
+          </if>
+          <if test="groupId != null">
+              and tcg.id = #{groupId}
+          </if>
+          <if test="companyId != null">
+              and tcc.id = #{companyId}
+          </if>
+          <if test="name != null and name != ''">
+              and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%')
+          </if>
+          <if test="idCard != null and idCard != ''">
+              and tcp.id_card = #{idCard}
+          </if>
+      and tcpro.type=0
+      and tcpro.`level` =2
+      and tcpro.team=0
+      and tcp.rec_status = 0
+      and tcc.rec_status = 0
+      and tcpp.rec_status = 0
+      and tcpro.rec_status = 0
+      </trim>
   </select>
   <select id="selectGroup" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
-    SELECT
-    tcpro.id as projectId,
-    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,
-    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
-    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
-    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
-    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
-    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
-    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
-    from
-    t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
-    LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
-    LEFT JOIN t_compete_player tcp on tcp.id = tctm.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
-    LEFT JOIN t_compete_time tctt on tctt.type = tcpro.type
-    WHERE
-    <if test="competeTimeId != null">
-      tctt.id = #{competeTimeId}
-    </if>
+      SELECT
+      tcpro.id as projectId,
+      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,
+      (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+      (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+      (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+      (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+      (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+      (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+      from
+      t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
+      LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
+      LEFT JOIN t_compete_player tcp on tcp.id = tctm.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
+      <trim prefix="(" prefixOverrides="and" suffix=")">
     <if test="projectId != null">
-      and tcpro.id = #{projectId}
+       tcpro.id = #{projectId}
     </if>
     <if test="groupId != null">
       and tcg.id = #{groupId}
@@ -167,13 +164,16 @@
     <if test="idCard != null and idCard != ''">
       and tcp.id_card = #{idCard}
     </if>
-    and tcpro.rec_status = 0
-    and tctm.rec_status = 0
-    and tcp.rec_status = 0
-    and tcc.rec_status = 0
-    and tcg.rec_status = 0
-    and tct.rec_status = 0
-    and tctt.rec_status = 0
+      and tcpro.type=0
+      and tcpro.`level` =2
+      and tcpro.team=1
+      and tcpro.rec_status = 0
+      and tctm.rec_status = 0
+      and tcp.rec_status = 0
+      and tcc.rec_status = 0
+      and tcg.rec_status = 0
+      and tct.rec_status = 0
+      </trim>
   </select>
     <select id="queryProjectConfig" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteProjectConfig">
       SELECT

From acf1aa0e14fe91a4f899f4947a15a6dc717fd335 Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Sat, 21 Nov 2020 14:10:58 +0800
Subject: [PATCH 2/2] 11-21-1

---
 .../ccsens/mt/api/CompeteScoreController.java |  10 +
 .../com/ccsens/mt/api/ExcelController.java    |  15 +-
 .../com/ccsens/mt/bean/dto/CompeteDto.java    |   4 +
 .../java/com/ccsens/mt/bean/vo/CompeteVo.java |   2 +-
 .../persist/dao/CompeteProjectConfigDao.java  |   6 +-
 .../com/ccsens/mt/service/CompeteService.java |  77 +++++
 .../com/ccsens/mt/service/ExcelService.java   | 299 ++++++++----------
 .../ccsens/mt/service/ICompeteService.java    |  11 +
 .../com/ccsens/mt/service/IExcelService.java  |  15 +-
 .../mapper_dao/CompeteProjectConfigDao.xml    | 105 ++++++
 .../resources/mapper_dao/CompeteScoreDao.xml  |   2 +-
 11 files changed, 371 insertions(+), 175 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
index 81bb0ffa..cae59d9a 100644
--- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -126,5 +127,14 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok(speedPassList);
     }
 
+    @MustLogin
+    @ApiOperation(value = "速度通级赛(导出)", notes = "")
+    @RequestMapping(value = "/speedPassOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse speedPassOut(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTimeAndProjectId> params) throws IOException {
+        log.info("速度通级赛(导出)：{}",params);
+        String path = competeService.speedPassOut(params.getParam());
+        return JsonResponse.newInstance().ok(path);
+    }
+
 
 }
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 80ea10e5..b2e2786e 100644
--- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java
@@ -115,11 +115,20 @@ public class ExcelController {
     }
 
     @MustLogin
-    @ApiOperation(value = "日程安排（导出）", notes = "")
+    @ApiOperation(value = "日程安排（查询）", notes = "")
     @RequestMapping(value = "/schedulePlanning", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.SchedulePlanDetail> schedulePlanning(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
         log.info("日程安排更新：{}",params);
-        List<TableVo.SchedulePlanDetail> schedulePlanDetailList = excelService.schedulePlanning(params.getParam());
-        return JsonResponse.newInstance().ok(schedulePlanDetailList);
+        List<TableVo.SchedulePlan> schedulePlanlList = excelService.schedulePlanning(params.getParam());
+        return JsonResponse.newInstance().ok(schedulePlanlList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "日程安排（导出）", notes = "")
+    @RequestMapping(value = "/schedulePlanningOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse schedulePlanningOut(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) throws IOException {
+        log.info("日程安排更新：{}",params);
+        String path = excelService.schedulePlanningOut(params.getParam());
+        return JsonResponse.newInstance().ok(path);
     }
 }
diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
index fb9955ed..6773268c 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
@@ -330,6 +330,10 @@ public class CompeteDto {
         private String name;
         @ApiModelProperty("身份证号")
         private String idCard;
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
 
     @Data
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 73f4b577..ac288f17 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
@@ -575,7 +575,7 @@ public class CompeteVo {
         private int secondGrade;
         @ApiModelProperty("3分钟单摇跳等级")
         private int minuteGrade;
-        @ApiModelProperty("3分钟单摇跳等级")
+        @ApiModelProperty("等级")
         private int grade;
         @ApiModelProperty("玩家id")
         private Long playerId;
diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
index 7edf2578..2ab673a4 100644
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
@@ -16,11 +16,15 @@ import java.util.List;
  */
 public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
     CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
-    List<TableVo.SchedulePlanDetail> selectDetail ();
+    List<TableVo.SchedulePlan> selectDetail ();
     List<TableVo.CompeteJoin> selectSingle (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
     List<TableVo.CompeteJoin> selectGroup (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
     CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId);
 
+    List<TableVo.CompeteJoin> selectPeople (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
+
+
+
 
     /**
      * 查询所有项目配置信息
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 41f609c3..27a96117 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -15,6 +15,7 @@ import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
+import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
 import com.ccsens.mt.util.Constant;
@@ -1452,6 +1453,8 @@ public class CompeteService implements ICompeteService {
         return speedPassList;
     }
 
+
+
     @Override
     public List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param) {
         List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
@@ -1589,4 +1592,78 @@ public class CompeteService implements ICompeteService {
         return null;
     }
 
+
+    @Override
+    public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException {
+        List<CompeteVo.SpeedPass> speedPasses = speedPass(params);
+        String path = getExcelFilePathForspeedPassOut(speedPasses);
+        return path;
+    }
+
+    private String getExcelFilePathForspeedPassOut(List<CompeteVo.SpeedPass> arrayList) throws IOException {
+        //创建excle表格对象
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        //创建行对象
+        List<PoiUtil.PoiUtilCell> title = new ArrayList<>();
+        //给首行单元格赋值
+        title.add(new PoiUtil.PoiUtilCell("组别"));
+        title.add(new PoiUtil.PoiUtilCell("参赛单位"));
+        title.add(new PoiUtil.PoiUtilCell("姓名"));
+        title.add(new PoiUtil.PoiUtilCell("30秒单摇跳（次）"));
+        title.add(new PoiUtil.PoiUtilCell("3分钟单摇跳（次）"));
+        title.add(new PoiUtil.PoiUtilCell("等级"));
+        title.add(new PoiUtil.PoiUtilCell("备注"));
+        list.add(title);
+        //创建整个excel表格对象
+        Workbook workbook = new XSSFWorkbook();
+        int i = 1;
+        for (CompeteVo.SpeedPass speedPass : arrayList) {
+            //行对象
+            List<PoiUtil.PoiUtilCell> cells = new ArrayList<>();
+            cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 300, 18));
+            //单元格对象
+            PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(speedPass.getGroupName());
+            cells.add(poiUtilCel);
+            PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(speedPass.getCompanyName());
+            cells.add(poiUtilCell);
+            PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(speedPass.getPlayerName());
+            cells.add(poiUtilCel2);
+            PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell();
+            if (ObjectUtil.isNull(speedPass.getSecondTime())){
+                poiUtilCel3.setValue("");
+            }else {
+                poiUtilCel3.setValue(speedPass.getSecondTime()+"");
+            }
+            cells.add(poiUtilCel3);
+            PoiUtil.PoiUtilCell poiUtilCel4 = new PoiUtil.PoiUtilCell();
+            if (ObjectUtil.isNull(speedPass.getMinuteTime())){
+                poiUtilCel4.setValue("");
+            }else {
+                poiUtilCel4.setValue(speedPass.getMinuteTime()+"");
+            }
+            cells.add(poiUtilCel4);
+            PoiUtil.PoiUtilCell poiUtilCel5 = new PoiUtil.PoiUtilCell(String.valueOf(speedPass.getGrade())+"");
+            cells.add(poiUtilCel5);
+            list.add(cells);
+            i++;
+        }
+        //生成excel表格对象，并将数据放入
+        Workbook wbs = PoiUtil.exportWB("速度通级赛", list, workbook);
+        //8：关联金山在线文档
+        String name = "速度通级赛" + ".xlsx";
+        String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
+        String path = PropUtil.path + filepath;
+//        String path =  filepath;
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名，
+        File file = new File(path);
+        OutputStream stream = new FileOutputStream(file);
+        wbs.write(stream);
+        stream.close();
+        return PropUtil.imgDomain+filepath;
+    }
+
 }
\ 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 9807c02e..d2290698 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@@ -19,10 +19,13 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
 import com.ctc.wstx.util.DataUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.time.DateUtils;
+import org.apache.poi.ss.usermodel.Table;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
@@ -1143,179 +1146,34 @@ public class ExcelService implements IExcelService {
 
     @Override
     public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
-          List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
-          //个人项目查询
-          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
-          for (TableVo.CompeteJoin competeJoin : competeJoinList1){
-              competeJoinList.add(competeJoin);
-          }
-          //团队项目查询
-          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
-          for (TableVo.CompeteJoin competeJoin : competeJoinList2){
-              competeJoinList.add(competeJoin);
-          }
-//        Long competeTimeId = params.getCompeteTimeId();
-//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
-//        int 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());
-//                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-//                    //项目id
-//                    competeJoin.setProjectId(competeProject.getId());
-//                    //姓名
-//                    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());
-//                    }
-//                    //体检证明
-//                    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);
-//                    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());
-//                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-//                        //项目id
-//                        competeJoin.setProjectId(competeProject.getId());
-//                        //姓名
-//                        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());
-//                        }
-//                        //体检证明
-//                        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);
-//                        competeJoinList.add(competeJoin);
-//                    }
-//                }
-//            }
-//        }
-//        return competeJoinList;
-
+//          List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
+//          个人项目查询
+//        PageHelper.startPage(params.getPage(),params.getSize());
+//          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+//        PageInfo pageInfo = new PageInfo<>(competeJoinList1);
+//          for (TableVo.CompeteJoin competeJoin : competeJoinList1){
+//              competeJoinList.add(competeJoin);
+//          }
+//          //团队项目查询
+//          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+//          for (TableVo.CompeteJoin competeJoin : competeJoinList2){
+//              competeJoinList.add(competeJoin);
+//          }
+        PageHelper.startPage(params.getPage(),params.getSize());
+        List<TableVo.CompeteJoin> competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard());
+        PageInfo pageInfo = new PageInfo<>(competeJoinList);
         return  competeJoinList;
     }
 
     @Override
-    public List<TableVo.SchedulePlanDetail> schedulePlanning(CompeteDto.CompeteTime params) {
-        List<TableVo.SchedulePlanDetail> schedulePlanDetailListMorning = new ArrayList<>();
-        List<TableVo.SchedulePlanDetail> schedulePlanDetailListAfternoon = new ArrayList<>();
-        List<TableVo.SchedulePlanDetail> schedulePlanDetailListNight = new ArrayList<>();
+    public List<TableVo.SchedulePlan> schedulePlanning(CompeteDto.CompeteTime params) {
+//        List<TableVo.SchedulePlanDetail> schedulePlanDetailListMorning = new ArrayList<>();
+//        List<TableVo.SchedulePlanDetail> schedulePlanDetailListAfternoon = new ArrayList<>();
+//        List<TableVo.SchedulePlanDetail> schedulePlanDetailListNight = new ArrayList<>();
 //        List<TableVo.SchedulePlan> schedulePlanList = new ArrayList<>();
         //关联查询项目名，该项目在config和project中都存在
-        List<TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
-
+        List<TableVo.SchedulePlan> schedulePlanList = competeProjectConfigDao.selectDetail();
+//        List<TableVo.SchedulePlan> schedulePlans.selectDetail();
 //        TableVo.SchedulePlanAll schedulePlanAll = new TableVo.SchedulePlanAll();
 //        Set set = new HashSet();
 //        if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) {
@@ -1356,7 +1214,112 @@ public class ExcelService implements IExcelService {
 //
 //
 //        }
-        return schedulePlanDetailList;
+        return schedulePlanList;
     }
+
+    @Override
+    public String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException {
+        List<TableVo.SchedulePlan> schedulePlanList = schedulePlanning(params);
+        String path = getExcelFilePathForSchedulePlanning(schedulePlanList);
+        return path;
+    }
+
+
+
+
+    private String getExcelFilePathForSchedulePlanning(List<TableVo.SchedulePlan> arrayList) throws IOException {
+        //创建excle表格对象
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        //创建行对象
+        List<PoiUtil.PoiUtilCell> title = new ArrayList<>();
+        //给首行单元格赋值
+        title.add(new PoiUtil.PoiUtilCell("序号"));
+        title.add(new PoiUtil.PoiUtilCell("日期"));
+        title.add(new PoiUtil.PoiUtilCell("上午"));
+        title.add(new PoiUtil.PoiUtilCell("下午"));
+        title.add(new PoiUtil.PoiUtilCell("晚上"));
+        list.add(title);
+        //创建整个excel表格对象
+        Workbook workbook = new XSSFWorkbook();
+        int i = 1;
+        for (TableVo.SchedulePlan schedulePlan : arrayList) {
+            //行对象
+            List<PoiUtil.PoiUtilCell> cells = new ArrayList<>();
+            cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 3000, 18));
+            //单元格对象
+            PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(schedulePlan.getDate());
+            cells.add(poiUtilCel3);
+            StringBuilder stringBuilder = new StringBuilder();
+            if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListMorning())) {
+                for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListMorning()) {
+                    Date date = new Date(schedulePlanDetail.getStartTime());
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
+                    String year = simpleDateFormat.format(date);
+                    Date date1 = new Date(schedulePlanDetail.getEndTime());
+                    SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
+                    String year1 = simpleDateFormat.format(date);
+                    String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
+                    stringBuilder.append(string+"  \n");
+
+                }
+            }
+            PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(stringBuilder.toString());
+            cells.add(poiUtilCel);
+            StringBuilder stringBuilder1 = new StringBuilder();
+            if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListAfternoon())) {
+                for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListAfternoon()) {
+                    Date date = new Date(schedulePlanDetail.getStartTime());
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
+                    String year = simpleDateFormat.format(date);
+                    Date date1 = new Date(schedulePlanDetail.getEndTime());
+                    SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
+                    String year1 = simpleDateFormat.format(date);
+                    String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
+                    stringBuilder.append(string+"  ");
+                }
+            }
+            PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(stringBuilder1.toString());
+            cells.add(poiUtilCell);
+            StringBuilder stringBuilder2 = new StringBuilder();
+            if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListNight())){
+            for (TableVo.SchedulePlanDetail schedulePlanDetail: schedulePlan.getSchedulePlanDetailListNight()){
+                Date date = new Date(schedulePlanDetail.getStartTime());
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
+                String year = simpleDateFormat.format(date);
+                Date date1 = new Date(schedulePlanDetail.getEndTime());
+                SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
+                String year1 = simpleDateFormat.format(date);
+                String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
+                stringBuilder.append(string+"  ");
+                }
+            }
+            PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(stringBuilder2.toString());
+            cells.add(poiUtilCel2);
+            list.add(cells);
+            i++;
+        }
+        //生成excel表格对象，并将数据放入
+        Workbook wbs = PoiUtil.exportWB("日程安排", list, workbook);
+        //8：关联金山在线文档
+        String name = "日程安排" + ".xlsx";
+        String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
+        String path = PropUtil.path + filepath;
+//        String path =  filepath;
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名，
+        File file = new File(path);
+        OutputStream stream = new FileOutputStream(file);
+        wbs.write(stream);
+        stream.close();
+        return PropUtil.imgDomain+filepath;
+    }
+
+
+
+
+
 }
 
diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
index 8cf36d5c..8ca886bc 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java
@@ -196,6 +196,14 @@ public interface ICompeteService {
     List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
 
 
+    /**
+     <<<<<<< HEAD
+     * 速度通级赛(导出)
+     * @param params 项目id和场次id
+     * @return 返回项目，开始时间和比赛状态
+     */
+    String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException;
+
 /**
     查看技术赛成绩公示表
     @param param
@@ -206,6 +214,9 @@ public interface ICompeteService {
     CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param);
 
     Long getUserCompanyId(Long userId, Byte type);
+
+
+
 }
 
 
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 29fb90a6..fe6707b7 100644
--- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java
@@ -82,6 +82,19 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.SchedulePlanDetail> schedulePlanning(CompeteDto.CompeteTime params);
+    List<TableVo.SchedulePlan> schedulePlanning(CompeteDto.CompeteTime params);
+
+    /**
+     * 查询导出
+     * @param  params 大赛id
+     * @return 返回失败的信息
+     */
+    String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException;
+
+
+
+
+
+
 
 }
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index f097e789..ae109515 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -80,6 +80,109 @@
     where project_id = #{projectId}
   </select>
 
+    <select id="selectPeople" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+        SELECT
+        tcpro.id as projectId,
+        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,
+        (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+        (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+        (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+        (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+        (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+        (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+        from
+        t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
+        LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
+        LEFT JOIN t_compete_player tcp on tcp.id = tctm.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
+        <trim prefix="(" prefixOverrides="and" suffix=")">
+            <if test="projectId != null">
+                tcpro.id = #{projectId}
+            </if>
+            <if test="groupId != null">
+                and tcg.id = #{groupId}
+            </if>
+            <if test="companyId != null">
+                and tcc.id = #{companyId}
+            </if>
+            <if test="name != null and name != ''">
+                and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%')
+            </if>
+            <if test="idCard != null and idCard != ''">
+                and tcp.id_card = #{idCard}
+            </if>
+            and tcpro.type=0
+            and tcpro.`level` =2
+            and tcpro.team=1
+            and tcpro.rec_status = 0
+            and tctm.rec_status = 0
+            and tcp.rec_status = 0
+            and tcc.rec_status = 0
+            and tcg.rec_status = 0
+            and tct.rec_status = 0
+        </trim>
+        UNION
+        SELECT
+        tcpro.id as projectId,
+        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,
+        (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+        (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+        (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+        (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+        (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+        (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+        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 tcpp.player_id = tcp.id
+        LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+        LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+        where
+        <trim prefix="(" prefixOverrides="and" suffix=")">
+            <if test="projectId != null">
+                tcpro.id = #{projectId}
+            </if>
+            <if test="groupId != null">
+                and tcg.id = #{groupId}
+            </if>
+            <if test="companyId != null">
+                and tcc.id = #{companyId}
+            </if>
+            <if test="name != null and name != ''">
+                and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%')
+            </if>
+            <if test="idCard != null and idCard != ''">
+                and tcp.id_card = #{idCard}
+            </if>
+            and tcpro.type=0
+            and tcpro.`level` =2
+            and tcpro.team=0
+            and tcp.rec_status = 0
+            and tcc.rec_status = 0
+            and tcpp.rec_status = 0
+            and tcpro.rec_status = 0
+        </trim>
+
+    </select>
+
+
+
+
+
+
+
+
   <select id="selectSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
       SELECT
       tcpro.id as projectId,
@@ -126,6 +229,8 @@
       and tcpro.rec_status = 0
       </trim>
   </select>
+
+
   <select id="selectGroup" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
       SELECT
       tcpro.id as projectId,
diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index 02bfbd9c..88dcc793 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -160,7 +160,7 @@
   <select id="selectByProjectIdAndPid" resultType="com.ccsens.mt.bean.vo.CompeteVo$SpeedPass" parameterType="java.util.Map">
     select
     tcg.group_name AS groupName,
-    tcp.`name` as playName,
+    tcp.`name` as playerName,
     tcc.`name` as companyName,
     tccp.player_id as playerId,
     tccp.project_id as projectId