From 6818cc61896b5343c4a5abb054781461bc860b6b Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 27 Nov 2020 09:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8A=B1=E6=A0=B7=E8=B5=9B?= =?UTF-8?q?=E5=9C=BA=E6=AC=A1=E6=B2=A1=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java | 1 - mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java | 2 ++ mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index a508ebdd..8b61d6a4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -82,7 +82,6 @@ public class CompeteVideoController { log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectTwoProject(params); return JsonResponse.newInstance().ok(list); - } @MustLogin @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查") 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 5c9c52f1..ca154140 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 @@ -549,6 +549,8 @@ public class CompeteVo { @ApiModelProperty("姓名") private String name; + @ApiModelProperty("场次") + private Byte competeOrder; @ApiModelProperty("场地信息") private Byte site; @ApiModelProperty("备注") 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 9572ad98..d756bbc3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1747,6 +1747,8 @@ public class CompeteService implements ICompeteService { } } + //场次信息 + selScropeVo.setCompeteOrder(competeStartOrder1.getCompeteOrder()); //场地信息 selScropeVo.setSite(competeStartOrder1.getSite());