diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java new file mode 100644 index 00000000..d676f4d9 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -0,0 +1,43 @@ +package com.ccsens.mt.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import com.ccsens.mt.service.IProvinceService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author 逗 + */ +@Slf4j +@Api(tags = "远程比赛省赛(集体报名)", description = "") +@RestController +@RequestMapping("/province") +public class ProvinceController { + @Resource + private IProvinceService provinceService; + + @MustLogin + @ApiOperation(value = "查找当前用户填写的信息的概览", notes = "") + @RequestMapping(value = "/overview", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getOverview(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找当前用户填写的信息的概览:{}",params); + ProvinceCompeteVo.CompeteOverview competeOverview = provinceService.getOverview(params.getParam(),params.getUserId()); + log.info("查找当前用户填写的信息的概览:{}",competeOverview); + return JsonResponse.newInstance().ok(competeOverview); + } + +} 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 new file mode 100644 index 00000000..81506c46 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -0,0 +1,28 @@ +package com.ccsens.mt.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author 逗 + */ +@Data +public class ProvinceCompeteVo { + @Data + @ApiModel("查看首页概览") + public static class CompeteOverview{ + @ApiModelProperty("参赛公司id") + private Long companyId; + @ApiModelProperty("参赛公司id") + private String companyName; + @ApiModelProperty("当前添加的教练的人数") + private int coachNum; + @ApiModelProperty("当前添加的领队的人数") + private int guideNum; + @ApiModelProperty("当前添加的参赛人员的人数") + private int playerNum; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteEnrollDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteEnrollDao.java index ef9dc8d3..55465a4d 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteEnrollDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteEnrollDao.java @@ -36,7 +36,7 @@ public interface CompeteEnrollDao extends CompetePlayerMapper { * @param player_id 团队id * @return 团队参赛的组别 */ - CompeteVo.EnrollPlayInfo getPlayerAndProjectForTeam(@Param("player_id")long player_id); + CompeteVo.EnrollPlayInfo getPlayerAndProjectForTeam(@Param("teamId")long teamId,@Param("player_id")long player_id); /** * 查询参赛团队id diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 1626e5ea..43146161 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -708,7 +708,7 @@ public class CompeteService implements ICompeteService { List teamList = competeEnrollDao.getTeamId(projectInfo.getId()); for (CompeteVo.Team team1 : teamList) { //6:获取团队下队员的详细信息 - CompeteVo.EnrollPlayInfo enrollPlayInfo = competeEnrollDao.getPlayerAndProjectForTeam(team1.getPlayer_id()); + CompeteVo.EnrollPlayInfo enrollPlayInfo = competeEnrollDao.getPlayerAndProjectForTeam(team1.getId(),team1.getPlayer_id()); if (ObjectUtil.isNotNull(enrollPlayInfo)) { enrollPlayInfo.setName(projectInfo.getName()); arrayList.add(enrollPlayInfo); diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java new file mode 100644 index 00000000..e25589fa --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -0,0 +1,17 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; + +/** + * @author 逗 + */ +public interface IProvinceService { + /** + * 查找当前用户填写的信息的概览 + * @param param + * @param userId + * @return + */ + ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java new file mode 100644 index 00000000..9f802e17 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -0,0 +1,22 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class ProvinceService implements IProvinceService{ + + @Override + public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { + return null; + } +} diff --git a/mt/src/main/resources/mapper_dao/CompeteEnrollDao.xml b/mt/src/main/resources/mapper_dao/CompeteEnrollDao.xml index 2260dcaa..c3846e72 100644 --- a/mt/src/main/resources/mapper_dao/CompeteEnrollDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteEnrollDao.xml @@ -88,6 +88,7 @@ )a on a.tId = t.id WHERE p.id = #{player_id} + and t.id = #{teamId} and p.rec_status = 0 and t.rec_status = 0 diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index 2f56e0ce..5e440c39 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java @@ -957,14 +957,20 @@ public class ProjectService implements IProjectService { proRoleDao.insertSelective(firstRole); parentId = firstRole.getId(); } - //添加角色 - ProRole proRole = new ProRole(); - proRole.setId(snowflake.nextId()); - proRole.setName(thisProject.getName()); - proRole.setParentId(parentId); - proRole.setProjectId(projectParentId); - proRole.setRelevanceProjectId(thisProject.getId()); - proRoleDao.insertSelective(proRole); + //查找该项目是否已经是项目角色 + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(projectParentId) + .andRelevanceProjectIdEqualTo(thisProject.getId()).andParentIdEqualTo(parentId); + if (proRoleDao.countByExample(roleExample) == 0) { + //添加角色 + ProRole proRole = new ProRole(); + proRole.setId(snowflake.nextId()); + proRole.setName(thisProject.getName()); + proRole.setParentId(parentId); + proRole.setProjectId(projectParentId); + proRole.setRelevanceProjectId(thisProject.getId()); + proRoleDao.insertSelective(proRole); + } } /** diff --git a/tall/src/main/java/com/ccsens/tall/web/RoleController.java b/tall/src/main/java/com/ccsens/tall/web/RoleController.java index 29405bbe..072b68f1 100644 --- a/tall/src/main/java/com/ccsens/tall/web/RoleController.java +++ b/tall/src/main/java/com/ccsens/tall/web/RoleController.java @@ -107,8 +107,7 @@ public class RoleController { @ApiImplicitParams({ }) @RequestMapping(value = "/update/show", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse updateRoleShow(HttpServletRequest request, - @ApiParam @Validated @RequestBody RoleDto.UpdateRoleShow roleShow) throws Exception { + public JsonResponse updateRoleShow(HttpServletRequest request,@ApiParam @Validated @RequestBody RoleDto.UpdateRoleShow roleShow) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); proRoleService.updateRoleShow(currentUserId,roleShow); return JsonResponse.newInstance().ok();