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 f5715c4b..983dd98f 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -41,7 +41,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "项目状态", notes = "") + @ApiOperation(value = "项目状态", notes = "lihong,查询项目集合,再根据时间判断项目得状态") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); @@ -50,7 +50,7 @@ public class CompeteScoreController { } @MustLogin - @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); @@ -60,7 +60,7 @@ public class CompeteScoreController { @MustLogin - @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") + @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "多表关联之后,查询当前你场次得分数信息") @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreCurrentSite(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); @@ -69,7 +69,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "技术赛提交分数", notes = "") + @ApiOperation(value = "技术赛提交分数", notes = "接受前端得请求参数,插入相关得表中") @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表:{}",params); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + 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 a03505c0..1a789b7b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -42,7 +42,6 @@ tcp.`name` as name, tcc.`name` as companyName, tcvs.score as score - from t_compete_project_player tcpp LEFT JOIN t_compete_player tcp ON tcpp.player_id = tcp.id LEFT JOIN t_compete_start_order tcso on tcso.player_id = tcpp.player_id @@ -57,6 +56,7 @@ and tcpp.compete_group_id = #{competeGroupId} GROUP BY tcvs.score +