diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java index ea6506d0..c33a6cc8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java @@ -3,7 +3,6 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.vo.CompeteVo; -import com.ccsens.mt.service.CompeteService; import com.ccsens.mt.service.ICompeteService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; 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 e4409e53..58788bf8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -84,7 +84,7 @@ public class CompeteScoreController { } - @ApiOperation(value = "项目状态", notes = "") + @ApiOperation(value = "项目状态(手机用)", notes = "") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); @@ -93,7 +93,7 @@ public class CompeteScoreController { } - @ApiOperation(value = "选手排名", notes = "多个信息表关联之后,利用分数排序") + @ApiOperation(value = "选手排名(手机用)", notes = "多个信息表关联之后,利用分数排序") @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java index 00f8b89a..62452d6a 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java @@ -27,12 +27,18 @@ public class CompeteExcelVo { public static class TeamOrderPlayerList { @ApiModelProperty("团队id") private Long teamId; - @ApiModelProperty("场次") + @ApiModelProperty("场次加场地") private String startOrder; @ApiModelProperty("单位名称") private String companyName; @ApiModelProperty("团队选手名字") private String playerName; + @ApiModelProperty("视频路径") + private String videoUrl; + @ApiModelProperty("场次") + private String competeOrder; + @ApiModelProperty("场地") + private String site; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index e185a41c..51ca828b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -49,8 +49,10 @@ public class VideoProjectVo { private String phone; @ApiModelProperty("裁判类型") private byte chiefJudgment; - @ApiModelProperty("最近签到时间") - private Date time; +// @ApiModelProperty("最近签到时间") +// private Date time; + @ApiModelProperty("最近签到时间戳") + private Long time; } 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 2b49f45c..3c888c18 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1875,7 +1875,6 @@ public class CompeteService implements ICompeteService { if (project == null) { throw new BaseException(CodeEnum.PARAM_ERROR); } - PageHelper.startPage(param.getPageNum(), param.getSize()); List list; if (project.getTeam() == Constant.Compete.TEAM_YES) { 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 f9cc1991..64b5906e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -628,12 +628,21 @@ public class ExcelService implements IExcelService { two5.setValue("参赛单位"); PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); two6.setValue("参赛人员"); + PoiUtil.PoiUtilCell two7=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); + two7.setValue("比赛视频路径"); + PoiUtil.PoiUtilCell two8=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); + two7.setValue("场次"); + PoiUtil.PoiUtilCell two9=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); + two7.setValue("场地"); two.add(two1); two.add(two2); two.add(two3); two.add(two4); two.add(two5); two.add(two6); + two.add(two7); + two.add(two8); + two.add(two9); biao.add(two); for (CompeteExcelVo.Project project : allProjectList) { int j = 0, q = 0;//一个项目得长度 项目循环 @@ -675,12 +684,18 @@ public class ExcelService implements IExcelService { PoiUtil.PoiUtilCell three4 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getStartOrder(), 1, 1); PoiUtil.PoiUtilCell three5 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompanyName(), 1, 1); PoiUtil.PoiUtilCell three6 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getPlayerName(), 1, 1); + PoiUtil.PoiUtilCell three7 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getVideoUrl(), 1, 1); + PoiUtil.PoiUtilCell three8 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompeteOrder(), 1, 1); + PoiUtil.PoiUtilCell three9 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getSite(), 1, 1); three.add(three1); three.add(three2); three.add(three3); three.add(three4); three.add(three5); three.add(three6); + three.add(three7); + three.add(three8); + three.add(three9); biao.add(three); } } diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml index 8b496426..cf6c32d9 100644 --- a/mt/src/main/resources/druid-dev.yml +++ b/mt/src/main/resources/druid-dev.yml @@ -29,6 +29,7 @@ spring: testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8 +# url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index d70632ec..fccea8e3 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -237,7 +237,7 @@ and tcg.rec_status=0 @@ -560,7 +562,7 @@ having count(t2.groupName) <= 8