From 4a45558649f6b13ff9baee0ba743d6251240b6fb Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 30 Oct 2020 11:17:37 +0800 Subject: [PATCH] =?UTF-8?q?20201030=E5=BC=80=E5=A7=8B=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ProvinceController.java | 14 +++- .../com/ccsens/mt/bean/dto/CompeteDto.java | 46 +++++------ .../mt/bean/dto/ProvinceCompeteDto.java | 2 +- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 24 ++++++ .../mt/persist/dao/CompeteCompanyDao.java | 7 ++ .../ccsens/mt/service/IProvinceService.java | 20 +++-- .../ccsens/mt/service/ProvinceService.java | 82 +++++++++---------- .../mapper_dao/CompeteCompanyDao.xml | 22 ++++- .../com/ccsens/tall/bean/dto/UserDto.java | 2 +- 9 files changed, 138 insertions(+), 81 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index 5a1d8ceb..2a334af8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -126,7 +126,7 @@ public class ProvinceController { @MustLogin @ApiOperation(value = "查找此单位的领队和教练信息", notes = "") @RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查找此单位的领队和教练信息：{}",params); ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyCoachList = provinceService.queryCoach(params.getParam()); log.info("查找此单位的领队和教练信息：{}",competeCompanyCoachList); @@ -175,10 +175,20 @@ public class ProvinceController { @MustLogin @ApiOperation(value = "选手详细信息", notes = "") @RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("选手详细信息：{}",params); ProvinceCompeteVo.PlayerInfo playerInfo = provinceService.getPlayerInfo(params.getParam()); log.info("选手详细信息：{}",playerInfo); return JsonResponse.newInstance().ok(playerInfo); } + + @MustLogin + @ApiOperation(value = "查询教练或领队的详细信息", notes = "") + @RequestMapping(value = "/coachInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getCoachInfo(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询教练或领队的详细信息：{}",params); + ProvinceCompeteVo.GetCoach coachInfo = provinceService.getCoachInfo(params.getParam()); + log.info("查询教练或领队的详细信息：{}",coachInfo); + return JsonResponse.newInstance().ok(coachInfo); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 9d5b934d..452d0c35 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -250,33 +250,33 @@ public class CompeteDto { private int authorization; } - @Data - @ApiModel("当前用户参赛单位基本信息") - public static class AddCoach{ - @ApiModelProperty("参赛单位id") - private Long companyId; - @ApiModelProperty("教练或领队的id，有则修改，没有则添加") - private Long coachId; - @ApiModelProperty("身份: 0领队 1教练") - private int identity; - @ApiModelProperty("姓名") - private String name; - @ApiModelProperty("性别") - private int gender; - @ApiModelProperty("手机号") - private String phone; - @ApiModelProperty("身份证号") - private String idCard; - @ApiModelProperty("证件照（文件类型") - private Long idPhoto; - @ApiModelProperty("教练证（只有教练需要，文件类型") - private Long coachCertificate; - } +// @Data +// @ApiModel("当前用户参赛单位基本信息") +// public static class AddCoach{ +// @ApiModelProperty("参赛单位id") +// private Long companyId; +// @ApiModelProperty("教练或领队的id，有则修改，没有则添加") +// private Long coachId; +// @ApiModelProperty("身份: 0领队 1教练") +// private int identity; +// @ApiModelProperty("姓名") +// private String name; +// @ApiModelProperty("性别") +// private int gender; +// @ApiModelProperty("手机号") +// private String phone; +// @ApiModelProperty("身份证号") +// private String idCard; +// @ApiModelProperty("证件照（文件类型") +// private Long idPhoto; +// @ApiModelProperty("教练证（只有教练需要，文件类型") +// private Long coachCertificate; +// } @Data @ApiModel("领队id") public static class LeaderId{ - @ApiModelProperty("教练或领队的id，有则修改，没有则添加") + @ApiModelProperty("教练或领队的id") private Long coachId; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index 420b330b..cb3a445d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -108,7 +108,7 @@ public class ProvinceCompeteDto { @ApiModel("添加/修改领队或教练") public static class ModifyLeader{ @ApiModelProperty("参赛单位id") - private Long companyId; //参赛单位id + private Long companyId; //参赛单位id @ApiModelProperty("教练或领队的id") private Long coachId; //教练或领队的id，有则修改，没有则添加 @ApiModelProperty("身份: 0领队 1教练") diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 42204d34..85bf1c14 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -172,4 +172,28 @@ public class ProvinceCompeteVo { @ApiModelProperty("保险证明（浏览路径）") private String insuranceRecord; } + + + @Data + @ApiModel("查找性对或教练的详细基本信息") + public static class GetCoach{ + @ApiModelProperty("教练或领队的id，有则修改，没有则添加") + private Long coachId; + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("身份: 0领队 1教练") + private int identity; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("性别") + private int gender; + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("身份证号") + private String idCard; + @ApiModelProperty("证件照（浏览路径）") + private Long idPhoto; + @ApiModelProperty("教练证（浏览路径）") + private Long coachCertificate; + } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 05a15b18..f7db0974 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -86,4 +86,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return 参加的数量 */ int getTeamNumByPlayerId(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId); + + /** + * 查看教练或领队的详细信息 + * @param coachId 教练或领队的id + * @return 返回详细信息 + */ + ProvinceCompeteVo.GetCoach getCoachInfo(@Param("coachId")Long coachId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index f7986aca..7476d969 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -88,13 +88,13 @@ public interface IProvinceService { */ ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo param); - /** - * 添加领队和教练信息 - * @param - * @param - * @return - */ - void saveCoach(CompeteDto.AddCoach param); +// /** +// * 添加领队和教练信息 +// * @param +// * @param +// * @return +// */ +// void saveCoach(CompeteDto.AddCoach param); /** * 删除领队和教练信息 @@ -125,4 +125,10 @@ public interface IProvinceService { */ ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param); + /** + * 查看领队或教练的详细信息 + * @param param 领队或教练的id + * @return 返回详细信息 + */ + ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index c5fe8621..93f6bdc2 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -294,14 +294,18 @@ public class ProvinceService implements IProvinceService { CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(company); List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); - ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); + +// ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); List competeCompanyCoachList = new ArrayList(); - ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); + +// ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); List competeCompanyLeadersList = new ArrayList(); + ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = new ProvinceCompeteVo.CompeteCompanyHeadList(); if (CollectionUtil.isNotEmpty(competeCoachList)){ for (CompeteCoach competeCoach : competeCoachList){ if (competeCoach.getIdentity() == 0){ + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); //给领队赋值 competeCompanyCoach.setCoachName(competeCoach.getName()); competeCompanyCoach.setCoachId(competeCoach.getId()); @@ -311,6 +315,7 @@ public class ProvinceService implements IProvinceService { }else { + ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); //给教练赋值 competeCompanyLeader.setGuideName(competeCoach.getName()); competeCompanyLeader.setGuideId(competeCoach.getId()); @@ -326,29 +331,29 @@ public class ProvinceService implements IProvinceService { return competeCompanyHeadList; } - @Override - public void saveCoach(CompeteDto.AddCoach param) { - CompeteCoach competeCoach = new CompeteCoach(); - Long companyId = param.getCompanyId(); - competeCoach.setCompanyId(companyId); - Long cpachId = param.getCoachId(); - competeCoach.setId(cpachId); - int identity = param.getIdentity(); - competeCoach.setIdentity((byte) identity); - String name = param.getName(); - competeCoach.setName(name); - int gender = param.getGender(); - competeCoach.setGender((byte) gender); - String phone = param.getPhone(); - competeCoach.setPhone(phone); - String idCard = param.getIdCard(); - competeCoach.setIdCard(idCard); - Long idPhoto = param.getIdPhoto(); - competeCoach.setIdPhoto(idPhoto); - Long coachCertificate = param.getCoachCertificate(); - competeCoach.setCoachCertificate(coachCertificate); - competeCoachMapper.insertSelective(competeCoach); - } +// @Override +// public void saveCoach(CompeteDto.AddCoach param) { +// CompeteCoach competeCoach = new CompeteCoach(); +// Long companyId = param.getCompanyId(); +// competeCoach.setCompanyId(companyId); +// Long cpachId = param.getCoachId(); +// competeCoach.setId(cpachId); +// int identity = param.getIdentity(); +// competeCoach.setIdentity((byte) identity); +// String name = param.getName(); +// competeCoach.setName(name); +// int gender = param.getGender(); +// competeCoach.setGender((byte) gender); +// String phone = param.getPhone(); +// competeCoach.setPhone(phone); +// String idCard = param.getIdCard(); +// competeCoach.setIdCard(idCard); +// Long idPhoto = param.getIdPhoto(); +// competeCoach.setIdPhoto(idPhoto); +// Long coachCertificate = param.getCoachCertificate(); +// competeCoach.setCoachCertificate(coachCertificate); +// competeCoachMapper.insertSelective(competeCoach); +// } @Override public void deleteCoach(CompeteDto.LeaderId param) { @@ -559,28 +564,17 @@ public class ProvinceService implements IProvinceService { teamMember.setPlayerId(player.getId()); teamMemberMapper.insertSelective(teamMember); } -// //检查该选手报名项目数量 -// int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId()); -// if(a >= 6){ -// throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName())); -// } -// //团队性别组根据参赛成员而定 -// if (i == 0){ -// competeTeam.setGenderGroup(player.getGender()); -// }else { -// if(!competeTeam.getGenderGroup().equals(player.getGender())){ -// competeTeam.setGenderGroup((byte) 2); -// } -// } -// //添加成员表 -// CompeteTeamMember teamMember = new CompeteTeamMember(); -// teamMember.setId(snowflake.nextId()); -// teamMember.setCompeteTeamId(competeTeam.getId()); -// teamMember.setPlayerId(player.getId()); -// teamMemberMapper.insertSelective(teamMember); } } } + + /** + * 查找教练详细信息 + */ + @Override + public ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param) { + return competeCompanyDao.getCoachInfo(param.getCoachId()); + } } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 6cc588ee..7d7e09e0 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -68,10 +68,10 @@ cg.type = #{type} and cg.rec_status = 0 - and(p.company_id = #{companyId} or p.company_id is null) - AND (p.compete_group_id =#{groupId} or p.compete_group_id is null) - AND (p.rec_status = 0 or p.rec_status is null) + + and(p.company_id = #{companyId} or p.company_id is null) + AND (p.rec_status = 0) + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java index 7482d60b..cfb5fab5 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java @@ -111,7 +111,7 @@ public class UserDto { @NotEmpty(message = "密码不能为空") @Pattern(regexp="^[a-zA-Z0-9._-]{6,20}$",message="密码长度需在6~20之间，不能使用汉字，不能包含特殊字符") private String password; - @ApiModelProperty("来源 0：默认注册，1：HT病人注册,2绿谷注册") + @ApiModelProperty("来源 0：默认注册，1:跳绳") private byte source = WebConstant.Regist.SOURCE; }