From 7eba2cd8b17219ad055d6ebe504e02750cf58050 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 27 Nov 2020 20:07:22 +0800 Subject: [PATCH 1/3] 20201127v1.7 --- .../java/com/ccsens/mt/api/CompeteScoreController.java | 4 ++-- .../java/com/ccsens/mt/bean/vo/CompeteExcelVo.java | 6 +++++- .../main/java/com/ccsens/mt/service/ExcelService.java | 10 ++++++++++ mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 2 ++ 5 files changed, 21 insertions(+), 5 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 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 97411957..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,7 +27,7 @@ public class CompeteExcelVo { public static class TeamOrderPlayerList { @ApiModelProperty("团队id") private Long teamId; - @ApiModelProperty("场次") + @ApiModelProperty("场次加场地") private String startOrder; @ApiModelProperty("单位名称") private String companyName; @@ -35,6 +35,10 @@ public class CompeteExcelVo { 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/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index ad5592a1..64b5906e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -630,6 +630,10 @@ public class ExcelService implements IExcelService { 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); @@ -637,6 +641,8 @@ public class ExcelService implements IExcelService { 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;//一个项目得长度 项目循环 @@ -679,6 +685,8 @@ public class ExcelService implements IExcelService { 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); @@ -686,6 +694,8 @@ public class ExcelService implements IExcelService { 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/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 8bd83ab9..5cb130b4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -903,6 +903,8 @@ + + From 28c726873eab4f98fc5df92bf03ce24d2d77395b Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 27 Nov 2020 20:10:44 +0800 Subject: [PATCH 2/3] 1111 --- .../mt/bean/po/CompeteProjectConfig.java | 12 ++--- .../bean/po/CompeteProjectConfigExample.java | 48 +++++++++---------- .../com/ccsens/mt/service/CompeteService.java | 1 + mt/src/main/resources/application.yml | 4 +- .../mapper_raw/CompeteProjectConfigMapper.xml | 28 +++++------ tall/src/main/resources/application.yml | 4 +- 6 files changed, 49 insertions(+), 48 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java index 48169c73..3adb055d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java @@ -26,7 +26,7 @@ public class CompeteProjectConfig implements Serializable { private Long videoEndTime; - private Byte restrict; + private Byte videoRestrict; private static final long serialVersionUID = 1L; @@ -118,12 +118,12 @@ public class CompeteProjectConfig implements Serializable { this.videoEndTime = videoEndTime; } - public Byte getRestrict() { - return restrict; + public Byte getVideoRestrict() { + return videoRestrict; } - public void setRestrict(Byte restrict) { - this.restrict = restrict; + public void setVideoRestrict(Byte videoRestrict) { + this.videoRestrict = videoRestrict; } @Override @@ -143,7 +143,7 @@ public class CompeteProjectConfig implements Serializable { sb.append(", recStatus=").append(recStatus); sb.append(", videoStartTime=").append(videoStartTime); sb.append(", videoEndTime=").append(videoEndTime); - sb.append(", restrict=").append(restrict); + sb.append(", videoRestrict=").append(videoRestrict); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java index 88ff98a4..f72a67af 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java @@ -765,63 +765,63 @@ public class CompeteProjectConfigExample { return (Criteria) this; } - public Criteria andRestrictIsNull() { - addCriterion("restrict is null"); + public Criteria andVideoRestrictIsNull() { + addCriterion("video_restrict is null"); return (Criteria) this; } - public Criteria andRestrictIsNotNull() { - addCriterion("restrict is not null"); + public Criteria andVideoRestrictIsNotNull() { + addCriterion("video_restrict is not null"); return (Criteria) this; } - public Criteria andRestrictEqualTo(Byte value) { - addCriterion("restrict =", value, "restrict"); + public Criteria andVideoRestrictEqualTo(Byte value) { + addCriterion("video_restrict =", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotEqualTo(Byte value) { - addCriterion("restrict <>", value, "restrict"); + public Criteria andVideoRestrictNotEqualTo(Byte value) { + addCriterion("video_restrict <>", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictGreaterThan(Byte value) { - addCriterion("restrict >", value, "restrict"); + public Criteria andVideoRestrictGreaterThan(Byte value) { + addCriterion("video_restrict >", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictGreaterThanOrEqualTo(Byte value) { - addCriterion("restrict >=", value, "restrict"); + public Criteria andVideoRestrictGreaterThanOrEqualTo(Byte value) { + addCriterion("video_restrict >=", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictLessThan(Byte value) { - addCriterion("restrict <", value, "restrict"); + public Criteria andVideoRestrictLessThan(Byte value) { + addCriterion("video_restrict <", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictLessThanOrEqualTo(Byte value) { - addCriterion("restrict <=", value, "restrict"); + public Criteria andVideoRestrictLessThanOrEqualTo(Byte value) { + addCriterion("video_restrict <=", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictIn(List values) { - addCriterion("restrict in", values, "restrict"); + public Criteria andVideoRestrictIn(List values) { + addCriterion("video_restrict in", values, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotIn(List values) { - addCriterion("restrict not in", values, "restrict"); + public Criteria andVideoRestrictNotIn(List values) { + addCriterion("video_restrict not in", values, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictBetween(Byte value1, Byte value2) { - addCriterion("restrict between", value1, value2, "restrict"); + public Criteria andVideoRestrictBetween(Byte value1, Byte value2) { + addCriterion("video_restrict between", value1, value2, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotBetween(Byte value1, Byte value2) { - addCriterion("restrict not between", value1, value2, "restrict"); + public Criteria andVideoRestrictNotBetween(Byte value1, Byte value2) { + addCriterion("video_restrict not between", value1, value2, "videoRestrict"); return (Criteria) this; } } 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 d4d6e19d..2b49f45c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -72,6 +72,7 @@ public class CompeteService implements ICompeteService { private CompeteProjectMapper competeProjectMapper; @Resource private CompeteProjectPlayerMapper competeProjectPlayerMapper; + @Resource private CompeteGroupMapper competeGroupMapper; @Resource diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml index 4e2ef4e2..2f69d15e 100644 --- a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml @@ -13,7 +13,7 @@ - + @@ -75,7 +75,7 @@ id, project_id, project_duration, site_num, start_time, end_time, created_at, updated_at, - rec_status, video_start_time, video_end_time, restrict + rec_status, video_start_time, video_end_time, video_restrict