ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tiaosheng
zy_Java 5 years ago
parent
01fad86630 89990f0275
commit
a4151ab1f1
6 changed files with 121 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
  2. 8
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  3. 27
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  4. 7
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java
  5. 4
      mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
  6. 113
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

13
mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
View File

@ -93,8 +93,9 @@ public class ProvinceController {
return JsonResponse.newInstance().ok(playerByCompanyIds);
}
@MustLogin
@ApiOperation(value = "查询当前用户参赛单位基本信息", notes = "")
@MustLogin
@RequestMapping(value = "/get/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ProvinceCompeteVo.CompeteCompany> getCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
log.info("查询当前用户参赛单位基本信息：{}",params);
@ -125,11 +126,11 @@ public class ProvinceController {
@MustLogin
@ApiOperation(value = "查找此单位的领队和教练信息", notes = "")
@RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ProvinceCompeteVo.CompeteCompanyCoach> queryCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
public JsonResponse<ProvinceCompeteVo.CompeteCompanyCoach> queryCoach(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.CompanyIdVo> params) {
log.info("查找此单位的领队和教练信息：{}",params);
ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = provinceService.queryCoach(params.getParam());
log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach);
return JsonResponse.newInstance().ok(competeCompanyCoach);
ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyCoachList = provinceService.queryCoach(params.getParam());
log.info("查找此单位的领队和教练信息：{}",competeCompanyCoachList);
return JsonResponse.newInstance().ok(competeCompanyCoachList);
}
//
// @MustLogin
@ -145,7 +146,7 @@ public class ProvinceController {
@MustLogin
@ApiOperation(value = "删除领队和教练信息", notes = "")
@RequestMapping(value = "/delete/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.LeaderId> params) {
log.info("删除领队和教练信息：{}",params);
provinceService.deleteCoach(params.getParam());
log.info("删除领队和教练信息：{}","删除成功");

8
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
View File

@ -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{

27
mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
View File

@ -108,14 +108,23 @@ public class ProvinceCompeteVo {
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
@ApiModel("查询教练信息")
public static class CompeteCompanyCoach {
@ApiModelProperty("教练id")
private Long coachId;
@ApiModelProperty("领队id")
private Long guideId;
@ApiModelProperty("教练名字")
private String coachName;
@ApiModelProperty("性别")
private int gender;
@ApiModelProperty("联系方式")
private String phone;
}
@Data
@ApiModel("查询领队信息")
public static class CompeteCompanyLeader {
@ApiModelProperty("领队id")
private Long guideId;
@ApiModelProperty("领队名字")
private String guideName;
@ApiModelProperty("性别")
@ -123,6 +132,18 @@ public class ProvinceCompeteVo {
@ApiModelProperty("联系方式")
private String phone;
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
public static class CompeteCompanyHeadList {
@ApiModelProperty("教练集合")
private List<CompeteCompanyCoach> competeCompanyCoachList;
@ApiModelProperty("领队信息")
private List<CompeteCompanyLeader> competeCompanyLeadersList;
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
public static class PlayerInfo {

7
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java
View File

@ -54,8 +54,15 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId);
/**
* 查找单位
* @param
* @return 返回单位信息
*/
ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")Long competeTimeId,@Param("userId")Long userId);
/**
* 查看单位报名的项目的数量
* @param companyId 单位id

4
mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
View File

@ -86,7 +86,7 @@ public interface IProvinceService {
* @param
* @return
*/
ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param);
ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo param);
/**
* 添加领队和教练信息
@ -102,7 +102,7 @@ public interface IProvinceService {
* @param
* @return
*/
void deleteCoach(CompeteDto.AddCoach param);
void deleteCoach(CompeteDto.LeaderId param);
/**
* 选择选手参加比赛

113
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
View File

@ -221,7 +221,13 @@ public class ProvinceService implements IProvinceService {
@Override
public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
Long competeTimeId = param.getCompeteTimeId();
return competeCompanyDao.getCompany(competeTimeId,userId);
ProvinceCompeteVo.CompeteCompany competeCompany = competeCompanyDao.getCompany(competeTimeId,userId);
if (ObjectUtil.isNull(competeCompany)){
competeCompany = new ProvinceCompeteVo.CompeteCompany();
}
return competeCompany;
}
@Override
@ -229,7 +235,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();
@ -241,14 +247,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());
}
@ -267,33 +275,51 @@ 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;
}
@Override
public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) {
public ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo 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){
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andCompanyIdEqualTo(company);
List<CompeteCoach> competeCoachList = competeCoachMapper.selectByExample(competeCoachExample);
ProvinceCompeteVo.CompeteCompanyCoach CompeteCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
List<ProvinceCompeteVo.CompeteCompanyCoach> competeCompanyCoachList = new ArrayList();
ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader();
List<ProvinceCompeteVo.CompeteCompanyLeader> competeCompanyLeadersList = new ArrayList();
ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = new ProvinceCompeteVo.CompeteCompanyHeadList();
if (CollectionUtil.isNotEmpty(competeCoachList)){
for (CompeteCoach competeCoach : competeCoachList){
if (competeCoach.getIdentity() == 0){
//给领队赋值
competeCompanyCoach.setCoachName(competeCoach.getName());
competeCompanyCoach.setCoachId(competeCoach.getId());
competeCompanyCoach.setGender(competeCoach.getGender());
competeCompanyCoach.setPhone(competeCoach.getPhone());
CompeteCompanyCoach.setCoachName(competeCoach.getName());
CompeteCompanyCoach.setCoachId(competeCoach.getId());
CompeteCompanyCoach.setGender(competeCoach.getGender());
CompeteCompanyCoach.setPhone(competeCoach.getPhone());
competeCompanyCoachList.add(CompeteCompanyCoach);
}else {
competeCompanyCoach.setGuideName(competeCoach.getName());
competeCompanyCoach.setCoachId(competeCoach.getId());
competeCompanyCoach.setGender(competeCoach.getGender());
competeCompanyCoach.setPhone(competeCoach.getPhone());
//给教练赋值
competeCompanyLeader.setGuideName(competeCoach.getName());
competeCompanyLeader.setGuideId(competeCoach.getId());
competeCompanyLeader.setGender(competeCoach.getGender());
competeCompanyLeader.setPhone(competeCoach.getPhone());
competeCompanyLeadersList.add(competeCompanyLeader);
}
return competeCompanyCoach;
}
competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList);
competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList);
}
return competeCompanyHeadList;
}
@Override
@ -321,31 +347,38 @@ 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);
competeCoach.setRecStatus((byte) 2);
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andIdEqualTo(coachId);
competeCoachMapper.updateByExample(competeCoach,competeCoachExample);
Long id = param.getCoachId();
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(id);
if (ObjectUtil.isNotNull(competeCoach)){
competeCoach.setRecStatus((byte) 2);
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andIdEqualTo(id);
competeCoachMapper.updateByExample(competeCoach,competeCoachExample);
}else {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
}
@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);
if (ObjectUtil.isNotNull(competePlayer)){
competePlayer.setRecStatus((byte) 2);
CompetePlayerExample competePlayerExample = new CompetePlayerExample();
competePlayerExample.createCriteria().andIdEqualTo(playerId);
competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
}else {
throw new BaseException(CodeEnum.PARAM_ERROR);
}
}
@Override

Write Preview
Loading…
Cancel
Save