diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java index 6baa3541..04586466 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java @@ -135,7 +135,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看个人基本报名信息", notes = "") @RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getCompetePlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse getCompetePlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看个人基本报名信息:{}",params); CompeteVo.GetPlayerInfo getPlayerInfo = competeService.getCompetePlayerInfo(params); return JsonResponse.newInstance().ok(getPlayerInfo); diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index 28c31040..06d3bf79 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java @@ -15,7 +15,7 @@ public interface CompetePlayerDao extends CompetePlayerMapper { * @param userId 用户ID * @return 选手信息 */ - CompeteVo.GetPlayerInfo getInfo(@Param("userId") Long userId); + CompeteVo.GetPlayerInfo getInfo(@Param("userId") Long userId,@Param("competeTimeId")Long competeTimeId); /** * 查询院系信息和裁判领队填表人的信息 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 f90ab9fe..3b71aeec 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -185,6 +185,7 @@ public class CompeteService implements ICompeteService{ BeanUtil.copyProperties(competePlayerInfo,player); player.setId(snowflake.nextId()); player.setUserId(userId); + player.setCompeteTimeId(competePlayerInfo.getCompeteTimeId()); player.setCompeteGroupId(competePlayerInfo.getGroupId()); if(ObjectUtil.isNotNull(company)) { player.setCompanyId(company.getId()); @@ -373,8 +374,8 @@ public class CompeteService implements ICompeteService{ * 查看个人基本报名信息 */ @Override - public CompeteVo.GetPlayerInfo getCompetePlayerInfo(QueryDto params) { - return competePlayerDao.getInfo(params.getUserId()); + public CompeteVo.GetPlayerInfo getCompetePlayerInfo(QueryDto params) { + return competePlayerDao.getInfo(params.getUserId(),params.getParam().getCompeteTimeId()); } /** diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 35f5b07b..39e0d137 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -78,7 +78,7 @@ public interface ICompeteService { * @param params * @return */ - CompeteVo.GetPlayerInfo getCompetePlayerInfo(QueryDto params); + CompeteVo.GetPlayerInfo getCompetePlayerInfo(QueryDto params); /** * 扫码加入团队 diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..d082c0ea 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: prod + include: common, util-prod \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 12a5441d..67511fee 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -43,8 +43,9 @@ t_compete_company c on p.company_id = c.id WHERE p.user_id = #{userId} + and p.compete_time_id = #{competeTimeId} AND p.rec_status = 0 - AND g.rec_status = 0 + AND (g.rec_status = 0 or g.rec_status is null) LIMIT 1