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 c4429ddc..3d142461 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -93,6 +93,7 @@ public class ProvinceController { return JsonResponse.newInstance().ok(playerByCompanyIds); } + @ApiOperation(value = "查询当前用户参赛单位基本信息", notes = "") @MustLogin @RequestMapping(value = "/get/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -114,7 +115,7 @@ public class ProvinceController { } @MustLogin @ApiOperation(value ="添加/修改领队或教练",notes = "") - @RequestMapping(value = "/province/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) public JsonResponse updataLeader(@ApiParam @Validated @RequestBody QueryDto params){ log.info("添加/修改单位信息：{}",params); provinceService.updateLeader(params.getParam()); @@ -131,28 +132,28 @@ public class ProvinceController { log.info("查找此单位的领队和教练信息：{}",competeCompanyCoachList); return JsonResponse.newInstance().ok(competeCompanyCoachList); } - - @MustLogin - @ApiOperation(value = "保存领队和教练信息", notes = "") - @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("保存领队和教练信息：{}",params); - provinceService.saveCoach(params.getParam()); - log.info("保存领队和教练信息：{}","插入成功"); - return JsonResponse.newInstance().ok(); - } +// +// @MustLogin +// @ApiOperation(value = "保存领队和教练信息", notes = "") +// @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto params) { +// log.info("保存领队和教练信息：{}",params); +// provinceService.saveCoach(params.getParam()); +// log.info("保存领队和教练信息：{}","插入成功"); +// return JsonResponse.newInstance().ok(); +// } @MustLogin @ApiOperation(value = "删除领队和教练信息", notes = "") @RequestMapping(value = "/delete/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto params) { log.info("删除领队和教练信息：{}",params); provinceService.deleteCoach(params.getParam()); log.info("删除领队和教练信息：{}","删除成功"); return JsonResponse.newInstance().ok(); } - + @MustLogin @ApiOperation(value = "参加比赛", notes = "") @RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse playerJoinProject(@ApiParam @Validated @RequestBody QueryDto params) { 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 82582a2e..1adc18c9 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 @@ -270,6 +270,14 @@ public class CompeteDto { @ApiModelProperty("教练证（只有教练需要，文件类型") private Long coachCertificate; } + + @Data + @ApiModel("领队id") + public static class LeaderId{ + @ApiModelProperty("教练或领队的id，有则修改，没有则添加") + private Long coachId; + + } @Data @ApiModel("项目id和组别id") public static class DelPlayer{ 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 73ae4517..069c9626 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 @@ -53,12 +53,15 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { */ List queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId); + /** * 查找单位 * @param * @return 返回单位信息 */ - ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")long competeTimeId,@Param("userId")long userId); + ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")Long competeTimeId,@Param("userId")Long userId); + + /** * 查看单位报名的项目的数量 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 d84f956f..1f4c5555 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -102,7 +102,7 @@ public interface IProvinceService { * @param * @return */ - void deleteCoach(CompeteDto.AddCoach param); + void deleteCoach(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 b0820746..c525dc7a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -225,7 +225,7 @@ public class ProvinceService implements IProvinceService { //判断当前单位id是否为空， Long companyid = param.getCompanyId(); CompeteCompany competeCompany = new CompeteCompany(); - ProvinceCompeteVo.CompeteCompany competeCompany1; + ProvinceCompeteVo.CompeteCompany competeCompany1 = new ProvinceCompeteVo.CompeteCompany(); //单位id为空，新增 if (ObjectUtil.isNull(companyid)){ Long id = snowflake.nextId(); @@ -237,14 +237,16 @@ public class ProvinceService implements IProvinceService { competeCompany.setLeaderNum(param.getGuideNum()); competeCompany.setJoinNum(param.getPlayerNum()); competeCompanyDao.insertSelective(competeCompany); - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + // + competeCompany1.setCompanyId(competeCompany.getId()); + competeCompany1.setCoachNum(competeCompany.getCoachNum()); + competeCompany1.setContactsName(competeCompany.getContactsName()); + competeCompany1.setContactsPhone(competeCompany.getContactsPhone()); + competeCompany1.setGuideNum(competeCompany.getLeaderNum()); + competeCompany1.setPlayerNum(competeCompany.getJoinNum()); }else { //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + competeCompany = competeCompanyDao.selectByPrimaryKey(companyid); if (ObjectUtil.isNotNull(param.getCoachNum())){ competeCompany.setCoachNum(param.getCoachNum()); } @@ -263,9 +265,12 @@ public class ProvinceService implements IProvinceService { if (ObjectUtil.isNotNull(param.getPlayerNum())) { competeCompany.setJoinNum(param.getPlayerNum()); } - competeCompanyDao.updateByPrimaryKeySelective(competeCompany); - competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId()); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample); + competeCompany1.setCompanyId(competeCompany.getId()); + competeCompany1.setCoachNum(competeCompany.getCoachNum()); + competeCompany1.setContactsName(competeCompany.getContactsName()); + competeCompany1.setContactsPhone(competeCompany.getContactsPhone()); + competeCompany1.setGuideNum(competeCompany.getLeaderNum()); + competeCompany1.setPlayerNum(competeCompany.getJoinNum()); } return competeCompany1; } @@ -332,17 +337,17 @@ public class ProvinceService implements IProvinceService { } @Override - public void deleteCoach(CompeteDto.AddCoach param) { + public void deleteCoach(CompeteDto.LeaderId param) { //<<<<<<< HEAD // Long coachId = param.getCoachId(); // CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId); // competeCoachMapper.deleteByPrimaryKey(competeCoach.getId()); //======= - Long coachId = param.getCoachId(); - CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId); + Long id = param.getCoachId(); + CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(id); competeCoach.setRecStatus((byte) 2); CompeteCoachExample competeCoachExample = new CompeteCoachExample(); - competeCoachExample.createCriteria().andIdEqualTo(coachId); + competeCoachExample.createCriteria().andIdEqualTo(id); competeCoachMapper.updateByExample(competeCoach,competeCoachExample); } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 9d9579f6..28325042 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -147,7 +147,8 @@