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 1/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; } } From bc57141788c9938430c97cbf1f45572965335776 Mon Sep 17 00:00:00 2001 From: Wang0018 <1007152140@qq.com> Date: Wed, 28 Oct 2020 18:03:50 +0800 Subject: [PATCH 2/2] 10.28 --- .../com/ccsens/mt/api/ProvinceController.java | 10 ++++++++ .../mt/bean/dto/ProvinceCompeteDto.java | 22 ++++++++++++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 ++ .../ccsens/mt/persist/dao/CompeteTimeDao.java | 1 + .../ccsens/mt/service/IProvinceService.java | 6 ++++- .../ccsens/mt/service/ProvinceService.java | 23 +++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) 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 ad15e257..1f8e6d53 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -112,6 +113,15 @@ public class ProvinceController { log.info("添加/修改单位信息:{}",competeCompany); return JsonResponse.newInstance().ok(competeCompany); } + @MustLogin + @ApiOperation(value ="添加/修改领队或教练",notes = "") + @RequestMapping(value = "/province/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()); + return JsonResponse.newInstance().ok(); + } + 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 b7da8617..82fe2a19 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 @@ -69,4 +69,26 @@ public class ProvinceCompeteDto { @ApiModelProperty("保险证明照片") private Part insuranceRecord; } + @Data + @ApiModel("添加/修改领队或教练") + public static class ModifyLeader{ + @ApiModelProperty("参赛单位id") + private Long companyId; //参赛单位id + @ApiModelProperty("教练或领队的id") + private Long coachId; //教练或领队的id,有则修改,没有则添加 + @ApiModelProperty("身份: 0领队 1教练") + private int identity; //身份: 0领队 1教练 + @ApiModelProperty("姓名") + private String name; //姓名 + @ApiModelProperty("性别") + private String 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 0d65ecbc..29c7076c 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.servlet.http.Part; import java.util.List; @@ -102,4 +103,5 @@ public class ProvinceCompeteVo { @ApiModelProperty("参赛人员的人数") private int playerNum; } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java index 53c51615..fac2476c 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java @@ -49,4 +49,5 @@ public interface CompeteTimeDao extends CompeteTimeMapper { * @return 返回组别信息 */ List queryGroupByProject(@Param("type") int type, @Param("projectId") Long projectId); + } 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 efc56efe..fb3d61ea 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -75,5 +75,9 @@ public interface IProvinceService { */ ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param); - + /** + * 添加/修改领队或教练 + * @param param + */ + void updateLeader(ProvinceCompeteDto.ModifyLeader 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 f61ba394..550652ac 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,5 +1,6 @@ package com.ccsens.mt.service; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -11,6 +12,7 @@ import com.ccsens.mt.persist.dao.CompeteCompanyDao; 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.util.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.PropUtil; @@ -45,6 +47,9 @@ public class ProvinceService implements IProvinceService { @Resource private CompetePlayerDao competePlayerDao; + @Resource + private CompeteCoachMapper competeCoachMapper; + /** * 查找当前用户填写的信息的概览 */ @@ -157,6 +162,7 @@ public class ProvinceService implements IProvinceService { commonFileMapper.insertSelective(fileDo); log.info("保存文件:{}", fileDo); return fileDo.getId(); + } @@ -216,5 +222,22 @@ public class ProvinceService implements IProvinceService { return competeCompany1; } + @Override + public void updateLeader(ProvinceCompeteDto.ModifyLeader param) { + Long coachId=param.getCoachId(); + if(ObjectUtil.isNull(coachId)){ + CompeteCoach competeCoach=new CompeteCoach(); + competeCoach.setId(snowflake.nextId()); + BeanUtil.copyProperties(param,competeCoach); + competeCoachMapper.insertSelective(competeCoach); + }else{ + CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId); + if(ObjectUtil.isNotNull(competeCoach)){ + BeanUtil.copyProperties(param,competeCoach); + competeCoachMapper.updateByPrimaryKeySelective(competeCoach); + } + } + } + }