修改

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -171,6 +171,7 @@ public class AbnormalService implements IAbnormalService {
         AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam();
 
         PageHelper.startPage(abnormalDto.getPage(), abnormalDto.getPageSize());
+
         List<AbnormalVo.AbnormalStatisticsVo> abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType());
 
         return new PageInfo<>(abnormalList);

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -163,6 +163,7 @@ public class PatientReportService implements IPatientReportService {
         List<PatientReportVo.ReportName> reportVos = new ArrayList<>();
         //分页查询报告单列表
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
+
         HtPatientReportExample reportExample = new HtPatientReportExample();
         //查询医生信息
         HtDoctorExample doctorExample = new HtDoctorExample();

mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -65,7 +66,7 @@ public class CompeteScoreController {
 
     @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩")
     @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<PageInfo<CompeteVo.TotalScoreDisplay>> showResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params){
+    public JsonResponse<PageInfo<CompeteVo.TotalScoreDisplay>> showResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultW> params){
         log.info("花样赛详细分数查看：{}",params);
         PageInfo<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList= competeService.showResultPage(params.getParam());
         return JsonResponse.newInstance().ok(totalScoreDisplaysList);
@@ -105,7 +106,7 @@ public class CompeteScoreController {
     @RequestMapping(value = "/query/countScoreAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
         log.info("查看计数赛成绩公示表：{}",params);
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam());
+        PageInfo<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam());
         log.info("查看计数赛成绩公示表：{}",params);
         return JsonResponse.newInstance().ok(countScoreCurrentSites);
     }
@@ -124,9 +125,18 @@ public class CompeteScoreController {
     @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.SpeedPass> speedPass(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTimeAndProjectId> params) {
         log.info("速度通级赛：{}",params);
-        List<CompeteVo.SpeedPass> speedPassList = competeService.speedPass(params.getParam());
+        PageInfo<CompeteVo.SpeedPass> speedPassList = competeService.speedPass(params.getParam());
         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);
+    }
+
 
 }

mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@@ -47,7 +47,7 @@ public class CompeteTaskController {
     @MustLogin
     @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" +
                                                         "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务")
-    @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.DailyScheduleProcess> updateCompeteConfig(
             @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.UpdateCompeteProjectConfig> params, HttpServletRequest request) {
         log.info("日程安排更新：{}",params);

mt/src/main/java/com/ccsens/mt/api/ExcelController.java

@@ -9,6 +9,7 @@ import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.service.IExcelService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -111,28 +112,37 @@ public class ExcelController {
     @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.EnterInfo> params) {
         log.info("日程安排更新：{}",params);
-        List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
+        PageInfo<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
         return JsonResponse.newInstance().ok(competeJoinList);
     }
 
     @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);
     }
     @MustLogin
     @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715")
     @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
+    public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultW> params) {
         log.info("参赛人数统计表：{}",params);
         String path = excelService.patternExpTable(params.getParam());
         return JsonResponse.newInstance().ok(path);
     }
     @MustLogin
-    @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715")
+    @ApiOperation(value = "计数赛成绩导出（导出）", notes = "100715")
     @RequestMapping(value = "/countExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
         log.info("参赛人数统计表：{}",params);

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")
@@ -333,6 +330,10 @@ public class CompeteDto {
         private String name;
         @ApiModelProperty("身份证号")
         private String idCard;
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
 
     @Data
@@ -378,6 +379,10 @@ public class CompeteDto {
         @NotNull
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
 
     @Data

mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java

@@ -131,13 +131,11 @@ public class ScoreDto {
         @NotNull
         @ApiModelProperty("项目id")
         private Long projectId;
-        @ApiModelProperty("第几页")
-        @Min(value = 1)
-        private int pageNum = 1;
-        @ApiModelProperty("每页多少条")
-        @Min(value = 1)
-        @Max(value=100)
-        private int pageSize = 10;
+
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
     @Data
     @ApiModel
@@ -156,5 +154,18 @@ public class ScoreDto {
         private Long judgmentId;
     }
 
-
+    @Data
+    @ApiModel
+    public static class ShowResultW {
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -577,7 +577,7 @@ public class CompeteVo {
         private int secondGrade;
         @ApiModelProperty("3分钟单摇跳等级")
         private int minuteGrade;
-        @ApiModelProperty("3分钟单摇跳等级")
+        @ApiModelProperty("等级")
         private int grade;
         @ApiModelProperty("玩家id")
         private Long playerId;

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.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.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);
+
+
+
 
     /**
      * 查询所有项目配置信息

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java

@@ -24,6 +24,9 @@ public interface CompeteScoreDao  {
     List<ScoreVo.CountScoreCurrentSite> selectCountScoreCurrentSite (@Param("siteId") long siteId);
     List<CompeteVo.SpeedPass> selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId);
 
+    List<ScoreVo.CountScoreCurrentSite> selectQueryCountScore(@Param("projectId")Long projectId);
+
+
 
 
 

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;
@@ -104,7 +105,7 @@ public class CompeteService implements ICompeteService {
 
 
     @Override
-    public PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResult param) {
+    public PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList=new ArrayList<>();
         CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample();
@@ -205,7 +206,7 @@ public class CompeteService implements ICompeteService {
      * @param param
      */
     @Override
-    public List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResult param) {
+    public List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param) {
         List<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList=new ArrayList<>();
         CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample();
         competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
@@ -1446,10 +1447,12 @@ public class CompeteService implements ICompeteService {
 
     @Override
 
-    public List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
+    public PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
+        PageHelper.startPage(params.getPage(),params.getSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
+        PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {
             for (CompeteVo.SpeedPass mes : speedPassList) {
                 //查30s单摇跳得分
@@ -1551,21 +1554,135 @@ public class CompeteService implements ICompeteService {
                 }
             }
         }
-        return speedPassList;
+        return pageInfo;
     }
 
-    @Override
-    public List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param) {
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
-        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
-        if(ObjectUtil.isNotNull(competeProject)) {
-            if(competeProject.getTeam() == 0) {
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
-            }else {
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
+    public List<CompeteVo.SpeedPass> speedPassCha(CompeteDto.CompeteTimeAndProjectId params) {
+        long projectId = params.getProjectId();
+        long competeTimeId = params.getCompeteTimeId();
+        PageHelper.startPage(params.getPage(),params.getSize());
+        List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
+        PageInfo pageInfo = new PageInfo<>(speedPassList);
+        if (CollectionUtil.isNotEmpty(speedPassList)) {
+            for (CompeteVo.SpeedPass mes : speedPassList) {
+                //查30s单摇跳得分
+                CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample();
+                competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId());
+                List<CompeteStartOrder> competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+                if (competeStartOrders.size() > 0) {
+                    CompeteStartOrder competeStartOrder = competeStartOrders.get(0);
+                    long id = competeStartOrder.getId();
+                    CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample();
+                    competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id);
+                    List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample);
+                    CompeteCountScore competeCountScore = competeCountScoreList.get(0);
+                    BigDecimal score = competeCountScore.getFinalScore();
+                    BigDecimal bigDecimal = new BigDecimal(2);
+                    BigDecimal secondTimeScore = score.multiply(bigDecimal);
+                    //查30s单摇跳得分 * 2 =次数
+                    mes.setSecondTime(secondTimeScore);
+                }
+                //3分钟单摇跳得分
+                CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample();
+                competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId());
+                List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+                if (competeStartOrders1.size() > 0) {
+                    CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0);
+                    long id1 = competeStartOrder1.getId();
+                    CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample();
+                    competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1);
+                    List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1);
+                    CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0);
+                    BigDecimal score1 = competeCountScore1.getFinalScore();
+                    BigDecimal bigDecimal1 = new BigDecimal(2);
+                    BigDecimal minuteTimeScore = score1.multiply(bigDecimal1);
+                    //3分钟单摇跳得分 * 2 =次数
+                    mes.setMinuteTime(minuteTimeScore);
+                }
+                BigDecimal bigDecimal0 = new BigDecimal(70);
+                BigDecimal bigDecimal2 = new BigDecimal(90);
+                BigDecimal bigDecimal3 = new BigDecimal(105);
+                BigDecimal bigDecimal4 = new BigDecimal(120);
+                BigDecimal bigDecimal5 = new BigDecimal(130);
+                BigDecimal bigDecimal6 = new BigDecimal(140);
+                BigDecimal bigDecimal7 = new BigDecimal(300);
+                BigDecimal bigDecimal8 = new BigDecimal(380);
+                BigDecimal bigDecimal9 = new BigDecimal(460);
+                BigDecimal bigDecimal10 = new BigDecimal(540);
+                BigDecimal bigDecimal11 = new BigDecimal(620);
+                BigDecimal bigDecimal12 = new BigDecimal(700);
+                BigDecimal s =mes.getSecondTime();
+                if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) {
+                    //判断30s单摇跳等级
+                    if (mes.getSecondTime().compareTo(bigDecimal0) < 1) {
+                        mes.setSecondGrade(1);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal2) < 1) {
+                        mes.setSecondGrade(2);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal3) < 1) {
+                        mes.setSecondGrade(3);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal4) < 1) {
+                        mes.setSecondGrade(4);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal5) < 1) {
+                        mes.setSecondGrade(5);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal6) < 1) {
+                        mes.setSecondGrade(6);
+                    }
+                    //判断3分钟单摇跳等级
+                    if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) {
+                        mes.setMinuteGrade(1);
+                    }
+                    if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) {
+                        mes.setMinuteGrade(2);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) {
+                        mes.setMinuteGrade(3);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) {
+                        mes.setMinuteGrade(4);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) {
+                        mes.setMinuteGrade(5);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) {
+                        mes.setMinuteGrade(6);
+                    }
+                    //如果30s得等级小于等于3分钟得等级
+                    if (mes.getSecondGrade() <= mes.getMinuteGrade()) {
+                        mes.setGrade(mes.getSecondGrade());
+                    } else {
+                        mes.setGrade(mes.getMinuteGrade());
+                    }
+                }
             }
         }
-        return countScoreCurrentSiteList;
+        return speedPassList;
+    }
+
+    @Override
+    public PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult params) {
+        PageHelper.startPage(params.getPage(),params.getSize());
+        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId());
+        PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites);
+//        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
+//        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+
+//        if(ObjectUtil.isNotNull(competeProject)) {
+//            if(competeProject.getTeam() == 0) {
+//                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
+//            }else {
+//                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
+//            }
+//        }
+        return pageInfo;
     }
 
     @Override
@@ -1694,4 +1811,78 @@ public class CompeteService implements ICompeteService {
         return null;
     }
 
+
+    @Override
+    public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException {
+        List<CompeteVo.SpeedPass> speedPasses = speedPassCha(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;
+    }
+
 }

mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@@ -79,6 +79,10 @@ public class CompeteTaskService implements ICompeteTaskService{
             return new ArrayList<>();
         }
             param.getUpdateCompeteTaskList().forEach(projectConfig -> {
+                //判断时间和时长是否正确
+                if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){
+                    return;
+                }
                 //获取项目
                 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
                 if(ObjectUtil.isNotNull(project)){
@@ -108,7 +112,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                     competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
                     projectConfigDao.insertSelective(competeProjectConfig);
                 }
-                // 生成出场顺序表，存入数据库。在tall内添加对应的任务
+                 //生成出场顺序表，存入数据库。在tall内添加对应的任务
                 setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token);
             });
 
@@ -132,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                         //计算场次
                         int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum());
                         //计算每个场次时间
-                        long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME;
+                        long projectStartTime = projectConfig.getStartTime();
                         long orderTime = 0;
                         if(order != 0) {
                             orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
@@ -199,7 +203,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-                                competeStartOrder.setTaskId(taskId);
+//                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);
@@ -287,7 +291,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-                                competeStartOrder.setTaskId(taskId);
+//                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);
@@ -418,6 +422,8 @@ public class CompeteTaskService implements ICompeteTaskService{
             competeJudgment.setSite(siteJudgment.getSite());
             competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
             competeJudgmentDao.insertSelective(competeJudgment);
+
+
             //添加角色
             MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
             saveRole.setProjectId(tallProjectId);

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -22,12 +22,16 @@ 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.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.POIDocument;
+import org.apache.poi.ss.usermodel.Table;
+
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.eclipse.jetty.util.StringUtil;
@@ -1152,190 +1156,35 @@ 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.getCompeteTimeId(),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());
-          for (TableVo.CompeteJoin competeJoin : competeJoinList2){
-              //获取身份证
-              String idCard = competeJoin.getIdCard();
-              //根据身份证获取选手年龄并赋值
-              int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
-              competeJoin.setAge(ageByIdCard);
-              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;
-
-        return  competeJoinList;
+    public PageInfo<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
+//          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  pageInfo;
     }
 
     @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)) {
@@ -1376,11 +1225,116 @@ 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;
     }
 
+
+
+
+
+
     @Override
-    public String patternExpTable(ScoreDto.ShowResult param) {
+    public String patternExpTable(ScoreDto.ShowResultW param) {
         List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResult(param);
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
@@ -1632,5 +1586,6 @@ public class ExcelService implements IExcelService {
         }
         return  PropUtil.domain + "file/download/know?path="+path;
     }
+
 }
 

mt/src/main/java/com/ccsens/mt/service/ICompeteService.java

@@ -155,9 +155,9 @@ public interface ICompeteService {
 
     void submitOrderList(ScoreDto.InformationSubmitted param);
 
-    PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResult param);
+    PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param);
 
-    List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResult param);
+    List<CompeteVo.TotalScoreDisplay> showResult(ScoreDto.ShowResultW param);
 
 
     /**
@@ -195,19 +195,30 @@ public interface ICompeteService {
      * @param params 项目id和场次id
      * @return 返回项目，开始时间和比赛状态
      */
-    List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
+    PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
 
 
+    /**
+     <<<<<<< HEAD
+     * 速度通级赛(导出)
+     * @param params 项目id和场次id
+     * @return 返回项目，开始时间和比赛状态
+     */
+    String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException;
+
 /**
     查看技术赛成绩公示表
     @param param
     @return
     */
-    List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
+    PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
 
     CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param);
 
     Long getUserCompanyId(Long userId, Byte type);
+
+
+
 }
 
 

mt/src/main/java/com/ccsens/mt/service/IExcelService.java

@@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 
 import java.io.IOException;
 import java.util.List;
@@ -43,7 +44,7 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
+    PageInfo<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
 
 
     /**
@@ -83,9 +84,22 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.SchedulePlanDetail> schedulePlanning(CompeteDto.CompeteTime params);
+    List<TableVo.SchedulePlan> schedulePlanning(CompeteDto.CompeteTime params);
 
-    String patternExpTable(ScoreDto.ShowResult param);
+    /**
+     * 查询导出
+     * @param  params 大赛id
+     * @return 返回失败的信息
+     */
+    String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException;
+
+
+
+
+
+
+
+    String patternExpTable(ScoreDto.ShowResultW param);
 
     String countExpTable(ScoreDto.ShowResult param);
 }

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -80,80 +80,182 @@
     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,
-    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 +269,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
@@ -185,17 +290,19 @@
       pc.start_time as startTime,
       pc.end_time as endTime
       FROM
-      t_compete_project p LEFT JOIN t_compete_project_config pc on pc.project_id = p.id
+      t_compete_project p
+      LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 and rec_status is null) pc on pc.project_id = p.id
       LEFT JOIN
           (
               SELECT
               pp.project_id as projectId
               FROM
               t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id
+              LEFT JOIN t_compete_company c on pl.company_id = c.id
               WHERE
               pp.rec_status = 0
               and pl .rec_status = 0
-
+              and c.rec_status = 0
           )a on a.projectId = p.id
           LEFT JOIN
           (
@@ -204,15 +311,18 @@
               FROM
               t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
               LEFT JOIN t_compete_player pl on m.player_id = pl.id
+              LEFT JOIN t_compete_company c on t.company_id = c.id
               WHERE
               t.rec_status = 0
               and m .rec_status = 0
               and pl .rec_status = 0
+              and c.rec_status = 0
               GROUP BY t.id
           )b on b.projectId = p.id
       WHERE
       p.type = #{type}
       and p.`level` = 2
+      and p.certificate = 0
       and p.rec_status = 0
       GROUP BY p.id
     </select>

mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

@@ -104,6 +104,64 @@
     and tccs.rec_status =0
     and tcso.id =#{siteId}
   </select>
+
+
+    <select id="selectQueryCountScore" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite" parameterType="java.util.Map">
+        SELECT @rownum:=@rownum+1 as rangee, b.* from (
+        SELECT
+        g.group_name as groupName ,
+        c.`name` companyName,
+        GROUP_CONCAT(p.`name`) as name,
+        s.judgment_a_score as mainOneScore,
+        s.judgment_b_score2 as mainTwoScore,
+        s.should_times as shouldScore,
+        s.chief_judgment_score as mainScore,
+        (s.judgment_a_score + s.judgment_b_score2) / 2,
+        s.deduct_times as deductTime,
+        s.final_score as finalScore
+        FROM
+        t_compete_start_order o
+        LEFT JOIN t_compete_team t on o.player_id = t.id and t.rec_status = 0
+        LEFT JOIN t_compete_team_member m on m.compete_team_id = t.id and m.rec_status = 0
+        LEFT JOIN t_compete_player p on m.player_id = p.id and p.rec_status = 0
+        LEFT JOIN t_compete_company c on c.id = t.company_id and c.rec_status = 0
+        LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
+        LEFT JOIN t_compete_count_score s on s.site_order_id = o.id and s.rec_status = 0
+        WHERE
+        o.project_id = #{projectId}
+        and
+        o.rec_status = 0
+        GROUP BY o.id
+        ORDER BY s.final_score DESC) b,(select @rownum:=0) a
+        UNION
+        SELECT @rownum:=@rownum+1 as rangee, b.* from (
+        SELECT
+        g.group_name as groupName,
+        c.`name` as companyName,
+        p.`name` as name,
+        s.judgment_a_score as mainOneScore,
+        s.judgment_b_score2 as mainTwoScore,
+        s.should_times as shouldScore,
+        s.chief_judgment_score as mainScore,
+        (s.judgment_a_score + s.judgment_b_score2) / 2,
+        s.deduct_times as deductTime,
+        s.final_score as finalScore
+        FROM
+        t_compete_start_order o
+        LEFT JOIN t_compete_project_player pp on o.player_id = pp.id and pp.rec_status = 0
+        LEFT JOIN t_compete_player p on pp.player_id = p.id and p.rec_status = 0
+        LEFT JOIN t_compete_company c on c.id = p.company_id and c.rec_status = 0
+        LEFT JOIN t_compete_group g on p.compete_group_id = g.id
+        LEFT JOIN t_compete_count_score s on s.site_order_id = o.id and s.rec_status = 0
+        WHERE
+        o.project_id = #{projectId}
+        and o.rec_status = 0
+        ORDER BY s.final_score DESC) b,(select @rownum:=0) a
+    </select>
+
+
+
+
     <select id="queryCountScoreAll" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
         SELECT @rownum:=@rownum+1 as rangee, b.* from (
         SELECT
@@ -160,7 +218,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

mt/src/main/resources/mapper_dao/CompeteTimeDao.xml

@@ -49,6 +49,7 @@
             rec_status = 0
         and
             type = #{type}
+        and sex < 2
         ORDER BY sequence
     </select>
 

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.cron.CronConstant;
 import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService {
         proTaskDetailExample.setOrderByClause("begin_time");
         List<ProTaskDetail> firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
         PageInfo pageInfo = new PageInfo<>(firstTaskDetailList);
+
+
+
         if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
             int sequence = 1;
             for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {