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 06af3853..50187eac 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1752,6 +1752,8 @@ public class CompeteService implements ICompeteService { } } + //场次信息 + selScropeVo.setCompeteOrder(competeStartOrder1.getCompeteOrder()); //场地信息 selScropeVo.setSite(competeStartOrder1.getSite());