From f559e149f7c016a1f552a561ea76ae44281f1740 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 10:18:54 +0800 Subject: [PATCH 1/4] tmp --- .../ccsens/mt/service/ProvinceService.java | 164 ------------------ 1 file changed, 164 deletions(-) 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 523f4b9e..0ff89679 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,166 +1,3 @@ -// -//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; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.stereotype.Service; -//import org.springframework.transaction.annotation.Propagation; -//import org.springframework.transaction.annotation.Transactional; -// -//import javax.annotation.Resource; -// -// -///** -// * @author 逗 -// */ -//@Slf4j -//@Service -//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) -//public class ProvinceService implements IProvinceService{ -// @Resource -// private CompeteCompanyDao competeCompanyDao; -// @Resource -// private Snowflake snowflake; -// @Resource -// private CompeteCoachMapper competeCoachMapper; -// -// @Override -// public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { -// return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId); -// } -// -// @Override -// public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) { -// Long competeTimeId = param.getCompeteTimeId(); -// ProvinceCompeteVo.CompeteCompany competeCompany = competeCompanyDao.getCompany(competeTimeId,userId); -// return competeCompany; -// } -// -// @Override -// public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) { -// //判断当前单位id是否为空， -// Long companyid = param.getCompanyId(); -// CompeteCompany competeCompany = new CompeteCompany(); -// ProvinceCompeteVo.CompeteCompany competeCompany1 =new ProvinceCompeteVo.CompeteCompany(); -// //单位id为空，新增 -// if (ObjectUtil.isNull(companyid)){ -// Long id = snowflake.nextId(); -// competeCompany.setId(id); -// competeCompany.setCoachNum(param.getCoachNum()); -// competeCompany.setName(param.getCompanyName()); -// competeCompany.setContactsName(param.getContactsName()); -// competeCompany.setContactsPhone(param.getContactsPhone()); -// competeCompany.setLeaderNum(param.getGuideNum()); -// competeCompany.setJoinNum(param.getPlayerNum()); -// 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查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改 -// competeCompany = competeCompanyDao.selectByPrimaryKey(companyid); -// if (ObjectUtil.isNotNull(param.getCoachNum())){ -// competeCompany.setCoachNum(param.getCoachNum()); -// } -// if (ObjectUtil.isNotNull(param.getCompanyName())) { -// competeCompany.setName(param.getCompanyName()); -// } -// if (ObjectUtil.isNotNull(param.getContactsName())) { -// competeCompany.setContactsName(param.getContactsName()); -// } -// if (ObjectUtil.isNotNull(param.getContactsPhone())) { -// competeCompany.setContactsPhone(param.getContactsPhone()); -// } -// if (ObjectUtil.isNotNull(param.getGuideNum())) { -// competeCompany.setLeaderNum(param.getGuideNum()); -// } -// if (ObjectUtil.isNotNull(param.getPlayerNum())) { -// competeCompany.setJoinNum(param.getPlayerNum()); -// } -// 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()); -// } -// -// -//} -//======= package com.ccsens.mt.service; import cn.hutool.core.lang.Snowflake; @@ -447,7 +284,6 @@ public class ProvinceService implements IProvinceService { @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(); From 797e50ebc8805896d46b5237de6a3851bb4cca73 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 12:05:25 +0800 Subject: [PATCH 2/4] c --- .../com/ccsens/mt/api/ProvinceController.java | 9 ++-- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 27 ++++++++-- .../mt/persist/dao/CompeteCompanyDao.java | 6 ++- .../ccsens/mt/service/IProvinceService.java | 2 +- .../ccsens/mt/service/ProvinceService.java | 53 +++++++++++++------ mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteCompanyDao.xml | 2 +- 7 files changed, 74 insertions(+), 29 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 e60abed7..c4429ddc 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -94,6 +94,7 @@ public class ProvinceController { } @ApiOperation(value = "查询当前用户参赛单位基本信息", notes = "") + @MustLogin @RequestMapping(value = "/get/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询当前用户参赛单位基本信息：{}",params); @@ -124,11 +125,11 @@ 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.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 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 d9b10438..4bd293c3 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 @@ -109,14 +109,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("性别") @@ -124,6 +133,18 @@ public class ProvinceCompeteVo { @ApiModelProperty("联系方式") private String phone; } + + @Data + @ApiModel("查询当前用户参赛单位基本信息") + public static class CompeteCompanyHeadList { + @ApiModelProperty("教练集合") + private List competeCompanyCoachList; + @ApiModelProperty("领队信息") + private List competeCompanyLeadersList; + + } + + @Data @ApiModel("查询当前用户参赛单位基本信息") public static class PlayerInfo { 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 c6195f1f..73ae4517 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,7 +53,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { */ List queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId); - + /** + * 查找单位 + * @param + * @return 返回单位信息 + */ 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 5d58e16c..d84f956f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -86,7 +86,7 @@ public interface IProvinceService { * @param * @return */ - ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param); + ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo 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 13431b34..b0820746 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -213,7 +213,11 @@ 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)){ +// throw new BaseException(CodeEnum.PARAM_ERROR); +// } + return competeCompany; } @Override @@ -266,26 +270,41 @@ public class ProvinceService implements IProvinceService { 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 competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); + ProvinceCompeteVo.CompeteCompanyCoach CompeteCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); + List competeCompanyCoachList = new ArrayList(); + 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){ //给领队赋值 - 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); + } + } + competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList); + competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList); + } - return competeCompanyCoach; + return competeCompanyHeadList; } @Override diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index b5782cb7..9d9579f6 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -151,7 +151,7 @@ contacts_name as contactsName, contacts_phone as contactsPhone, leader_num as guideNum , - judgment_num as coachNum, + coach_num as coachNum, join_num as playerNum from t_compete_company From 0bed58ad7f4781bb0aec37992e7adb74af951187 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 13:41:16 +0800 Subject: [PATCH 3/4] 10--29 --- .../ccsens/mt/service/ProvinceService.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) 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 c525dc7a..fdadbfce 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -345,10 +345,15 @@ public class ProvinceService implements IProvinceService { //======= Long id = param.getCoachId(); CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(id); - competeCoach.setRecStatus((byte) 2); - CompeteCoachExample competeCoachExample = new CompeteCoachExample(); - competeCoachExample.createCriteria().andIdEqualTo(id); - competeCoachMapper.updateByExample(competeCoach,competeCoachExample); + 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); + } + } @@ -356,11 +361,14 @@ public class ProvinceService implements IProvinceService { public void deletePlayer(CompeteDto.DelPlayer param) { Long playerId = param.getPlayerId(); 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 From 89990f02750d3d25a7d51269d9d2860a14978ceb Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 15:02:29 +0800 Subject: [PATCH 4/4] 10-29 --- .../main/java/com/ccsens/mt/service/ProvinceService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 fdadbfce..b02ab4aa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -214,9 +214,11 @@ public class ProvinceService implements IProvinceService { public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) { Long competeTimeId = param.getCompeteTimeId(); ProvinceCompeteVo.CompeteCompany competeCompany = competeCompanyDao.getCompany(competeTimeId,userId); -// if (ObjectUtil.isNull(competeCompany)){ -// throw new BaseException(CodeEnum.PARAM_ERROR); -// } + if (ObjectUtil.isNull(competeCompany)){ + competeCompany = new ProvinceCompeteVo.CompeteCompany(); + + } + return competeCompany; }