From 8e81245caec98477dccc71eb2ef1366106f804ea Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 28 Oct 2020 14:27:03 +0800 Subject: [PATCH 1/2] c --- .../com/ccsens/mt/api/ProvinceController.java | 31 ++++++- .../com/ccsens/mt/bean/dto/CompeteDto.java | 22 +++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 17 ++++ .../ccsens/mt/service/IProvinceService.java | 24 ++++++ .../ccsens/mt/service/ProvinceService.java | 85 ++++++++++++++++--- 5 files changed, 165 insertions(+), 14 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 7c019963..695e8097 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -53,13 +53,42 @@ public class ProvinceController { @MustLogin @ApiOperation(value = "添加/修改单位信息", notes = "") @RequestMapping(value = "/save/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveCompany(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse saveCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加/修改单位信息：{}",params); ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam()); log.info("添加/修改单位信息：{}",competeCompany); return JsonResponse.newInstance().ok(competeCompany); } + @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) { + log.info("查找此单位的领队和教练信息：{}",params); + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = provinceService.queryCoach(params.getParam()); + log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach); + return JsonResponse.newInstance().ok(competeCompanyCoach); + } + + @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) { + log.info("删除领队和教练信息：{}",params); + provinceService.deleteCoach(params.getParam()); + log.info("删除领队和教练信息：{}","删除成功"); + return JsonResponse.newInstance().ok(); + } 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 f3fd7331..aa0b954a 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 @@ -249,5 +249,27 @@ public class CompeteDto { private int authorization; } + @Data + @ApiModel("当前用户参赛单位基本信息") + public static class AddCoach{ + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("教练或领队的id，有则修改，没有则添加") + private Long cpachId; + @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/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index cdbd2771..99a0d41d 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 @@ -44,4 +44,21 @@ public class ProvinceCompeteVo { @ApiModelProperty("参赛人员的人数") private int playerNum; } + @Data + + @ApiModel("查询当前用户参赛单位基本信息") + public static class CompeteCompanyCoach { + @ApiModelProperty("教练id") + private Long coachId; + @ApiModelProperty("领队id") + private Long guideId; + @ApiModelProperty("教练名字") + private String coachName; + @ApiModelProperty("领队名字") + private String guideName; + @ApiModelProperty("性别") + private int gender; + @ApiModelProperty("联系方式") + private String phone; + } } 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 2eb4a1f6..29e43ffb 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -29,4 +29,28 @@ public interface IProvinceService { * @return */ ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param); + + /** + * 查找此单位的领队和教练信息 + * @param + * @param + * @return + */ + ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param); + + /** + * 添加领队和教练信息 + * @param + * @param + * @return + */ + void saveCoach(CompeteDto.AddCoach param); + + /** + * 删除领队和教练信息 + * @param + * @param + * @return + */ + void deleteCoach(CompeteDto.AddCoach 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 25baeb86..5d3edf99 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,13 +1,16 @@ package com.ccsens.mt.service; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.po.CompeteCoach; import com.ccsens.mt.bean.po.CompeteCompany; import com.ccsens.mt.bean.po.CompeteCompanyExample; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.persist.dao.CompeteCompanyDao; +import com.ccsens.mt.persist.mapper.CompeteCoachMapper; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.util.CodeEnum; import com.ccsens.util.exception.BaseException; @@ -31,8 +34,7 @@ public class ProvinceService implements IProvinceService{ @Resource private Snowflake snowflake; @Resource - CompeteCompanyMapper competeCompanyMapper; - + private CompeteCoachMapper competeCoachMapper; @Override public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { @@ -51,7 +53,7 @@ public class ProvinceService implements IProvinceService{ //判断当前单位id是否为空， Long companyid = param.getCompanyId(); CompeteCompany competeCompany = new CompeteCompany(); - ProvinceCompeteVo.CompeteCompany competeCompany1 =null; + ProvinceCompeteVo.CompeteCompany competeCompany1 =new ProvinceCompeteVo.CompeteCompany(); //单位id为空，新增 if (ObjectUtil.isNull(companyid)){ Long id = snowflake.nextId(); @@ -62,15 +64,16 @@ public class ProvinceService implements IProvinceService{ competeCompany.setContactsPhone(param.getContactsPhone()); competeCompany.setLeaderNum(param.getGuideNum()); competeCompany.setJoinNum(param.getPlayerNum()); - competeCompanyMapper.insertSelective(competeCompany); - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyMapper.selectByExample(competeCompanyExample); + competeCompanyDao.insertSelective(competeCompany); + competeCompany1.setCompanyName(competeCompany.getName()); + competeCompany1.setPlayerNum(competeCompany.getJoinNum()); + competeCompany1.setGuideNum(competeCompany.getLeaderNum()); + competeCompany1.setContactsPhone(competeCompany.getContactsPhone()); + competeCompany1.setContactsName(competeCompany.getContactsName()); + competeCompany1.setCoachNum(competeCompany.getCoachNum()); }else { //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 - CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); - competeCompanyExample.createCriteria().andIdEqualTo(companyid); - competeCompany = (CompeteCompany) competeCompanyMapper.selectByExample(competeCompanyExample); + competeCompany = competeCompanyDao.selectByPrimaryKey(companyid); if (ObjectUtil.isNotNull(param.getCoachNum())){ competeCompany.setCoachNum(param.getCoachNum()); } @@ -89,14 +92,70 @@ public class ProvinceService implements IProvinceService{ if (ObjectUtil.isNotNull(param.getPlayerNum())) { competeCompany.setJoinNum(param.getPlayerNum()); } - competeCompanyMapper.updateByPrimaryKeySelective(competeCompany); - competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId()); - competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyMapper.selectByExample(competeCompanyExample); + competeCompanyDao.updateByPrimaryKey(competeCompany); + competeCompany1.setCompanyName(competeCompany.getName()); + competeCompany1.setPlayerNum(competeCompany.getJoinNum()); + competeCompany1.setGuideNum(competeCompany.getLeaderNum()); + competeCompany1.setContactsPhone(competeCompany.getContactsPhone()); + competeCompany1.setContactsName(competeCompany.getContactsName()); + competeCompany1.setCoachNum(competeCompany.getCoachNum()); } return competeCompany1; } + @Override + public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) { + Long company = param.getCompanyId(); + CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(company); + if (ObjectUtil.isNull(competeCoach)){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); + if (competeCoach.getIdentity() == 0){ + //给领队赋值 + competeCompanyCoach.setCoachName(competeCoach.getName()); + competeCompanyCoach.setCoachId(competeCoach.getId()); + competeCompanyCoach.setGender(competeCoach.getGender()); + competeCompanyCoach.setPhone(competeCoach.getPhone()); + }else { + competeCompanyCoach.setGuideName(competeCoach.getName()); + competeCompanyCoach.setCoachId(competeCoach.getId()); + competeCompanyCoach.setGender(competeCoach.getGender()); + competeCompanyCoach.setPhone(competeCoach.getPhone()); + } + return competeCompanyCoach; + } + @Override + public void saveCoach(CompeteDto.AddCoach param) { + CompeteCoach competeCoach = new CompeteCoach(); + Long companyId = param.getCompanyId(); + competeCoach.setCompanyId(companyId); + Long cpachId = param.getCpachId(); + 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.AddCoach param) { + Long cpachId = param.getCpachId(); + CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(cpachId); + competeCoachMapper.deleteByPrimaryKey(competeCoach.getId()); + } } From e4f2eb27f3d2d8289c240968538a10faeecbdf8d Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 28 Oct 2020 16:02:32 +0800 Subject: [PATCH 2/2] 10-28 --- .../com/ccsens/mt/api/ProvinceController.java | 18 ++++++++ .../com/ccsens/mt/bean/dto/CompeteDto.java | 9 +++- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 29 +++++++++++- .../ccsens/mt/service/IProvinceService.java | 16 +++++++ .../ccsens/mt/service/ProvinceService.java | 44 ++++++++++++++++++- 5 files changed, 113 insertions(+), 3 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 39dd7625..d69959b4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -143,5 +143,23 @@ public class ProvinceController { return JsonResponse.newInstance().ok(); } + @MustLogin + @ApiOperation(value = "删除选手信息", notes = "") + @RequestMapping(value = "/del/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deletePlayer(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除选手信息：{}",params); + provinceService.deletePlayer(params.getParam()); + log.info("删除选手信息：{}","删除成功"); + return JsonResponse.newInstance().ok(); + } + @MustLogin + @ApiOperation(value = "选手详细信息", notes = "") + @RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + 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); + } } 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 aa0b954a..4e44e324 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 @@ -265,11 +265,18 @@ public class CompeteDto { @ApiModelProperty("手机号") private String phone ; @ApiModelProperty("身份证号") - private String idCard; + private String idCard; @ApiModelProperty("证件照（文件类型") private Long idPhoto; @ApiModelProperty("教练证（只有教练需要，文件类型") private Long coachCertificate; } + @Data + @ApiModel("项目id和组别id") + public static class DelPlayer{ + @ApiModelProperty("选手id") + private Long playerId; + + } } 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 8dda18f6..94d3a933 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 @@ -103,7 +103,6 @@ public class ProvinceCompeteVo { private int playerNum; } @Data - @ApiModel("查询当前用户参赛单位基本信息") public static class CompeteCompanyCoach { @ApiModelProperty("教练id") @@ -119,4 +118,32 @@ public class ProvinceCompeteVo { @ApiModelProperty("联系方式") private String phone; } + @Data + @ApiModel("查询当前用户参赛单位基本信息") + public static class PlayerInfo { + @ApiModelProperty("选手id") + private Long playerId ; + @ApiModelProperty("参赛单位id") + private Long competeId; + @ApiModelProperty("组别id") + private Long groupId; + @ApiModelProperty("选手姓名") + private String playerName; + @ApiModelProperty("性别") + private int gender; + @ApiModelProperty("身份证号") + private String idCard; + @ApiModelProperty("身份证正面照片 或户口本照片 （浏览路径）") + private String idCardFront ; + @ApiModelProperty("身份证反面照片（浏览路径）") + private String idCardBack; + @ApiModelProperty("一寸证件照（浏览路径）") + private Long idPhone; + @ApiModelProperty("学籍证明（浏览路径）") + private Long studentRecord; + @ApiModelProperty("体检证明（浏览路径）") + private Long healthRecord; + @ApiModelProperty("保险证明（浏览路径）") + private Long insuranceRecord; + } } 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 7a290937..fc81b3cb 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -100,4 +100,20 @@ public interface IProvinceService { */ void deleteCoach(CompeteDto.AddCoach param); + /** + * 删除选手信息 + * @param + * @param + * @return + */ + void deletePlayer(CompeteDto.DelPlayer param); + + /** + * 查看选手信息 + * @param + * @param + * @return + */ + ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer 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 7def52fd..523f4b9e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -175,6 +175,7 @@ import com.ccsens.mt.persist.dao.CompetePlayerDao; import com.ccsens.mt.persist.dao.CompeteTimeDao; import com.ccsens.mt.persist.mapper.CommonFileMapper; import com.ccsens.mt.persist.mapper.CompeteCoachMapper; +import com.ccsens.mt.persist.mapper.CompetePlayerMapper; import com.ccsens.mt.util.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.PropUtil; @@ -210,6 +211,8 @@ public class ProvinceService implements IProvinceService { private CompetePlayerDao competePlayerDao; @Resource private CompeteCoachMapper competeCoachMapper; + @Resource + private CompetePlayerMapper competePlayerMapper; /** * 查找当前用户填写的信息的概览 @@ -434,7 +437,46 @@ public class ProvinceService implements IProvinceService { public void deleteCoach(CompeteDto.AddCoach param) { Long cpachId = param.getCpachId(); CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(cpachId); - competeCoachMapper.deleteByPrimaryKey(competeCoach.getId()); + competeCoach.setRecStatus((byte) 2); + CompeteCoachExample competeCoachExample = new CompeteCoachExample(); + competeCoachExample.createCriteria().andIdEqualTo(cpachId); + competeCoachMapper.updateByExample(competeCoach,competeCoachExample); + + } + + @Override + public void deletePlayer(CompeteDto.DelPlayer param) { + Long playerId = param.getPlayerId(); +// competePlayerMapper.deleteByPrimaryKey(playerId); + CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId); + competePlayer.setRecStatus((byte) 2); + CompetePlayerExample competePlayerExample = new CompetePlayerExample(); + competePlayerExample.createCriteria().andIdEqualTo(playerId); + competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample); + + } + + @Override + public ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param) { + Long playerId = param.getPlayerId(); + CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId); + if (ObjectUtil.isNull(competePlayer)){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + ProvinceCompeteVo.PlayerInfo playerInfo = new ProvinceCompeteVo.PlayerInfo(); + playerInfo.setPlayerId(competePlayer.getId()); + playerInfo.setCompeteId(competePlayer.getCompeteTimeId()); + playerInfo.setGroupId(competePlayer.getCompeteGroupId()); + playerInfo.setPlayerName(competePlayer.getName()); + playerInfo.setGender(competePlayer.getGender()); + playerInfo.setIdCard(competePlayer.getIdCard()); + playerInfo.setIdCardFront(competePlayer.getIdCardFront()); + playerInfo.setIdCardBack(competePlayer.getIdCardBack()); + playerInfo.setIdPhone(competePlayer.getIdPhotoFile()); + playerInfo.setStudentRecord(competePlayer.getStudentRecordFile()); + playerInfo.setHealthRecord(competePlayer.getHealthRecordFile()); + playerInfo.setInsuranceRecord(competePlayer.getInsuranceRecordFile()); + return playerInfo; } }