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 167b979c..3896b129 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -64,16 +64,16 @@ public class ProvinceController { return JsonResponse.newInstance().ok(projectList); } -// @MustLogin -// @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "") -// @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse> queryProjectByFirstProject( -// @ApiParam @Validated @RequestBody QueryDto params) { -// log.info("查找二级比赛项目的信息:{}",params); -// List projectList = provinceService.queryProjectByCompeteTimeId(params.getParam(),params.getUserId()); -// log.info("查找二级比赛项目的信息:{}",projectList); -// return JsonResponse.newInstance().ok(projectList); -// } + @MustLogin + @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "") + @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryProjectByFirstProject( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找二级比赛项目的信息:{}",params); + List projectList = provinceService.queryProjectByFirstProject(params.getParam(),params.getUserId()); + log.info("查找二级比赛项目的信息:{}",projectList); + return JsonResponse.newInstance().ok(projectList); + } @MustLogin @ApiOperation(value = "新加/修改参赛人员", notes = "") 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 726b2f96..63b58130 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 @@ -13,6 +13,14 @@ import javax.validation.constraints.NotNull; @Data public class ProvinceCompeteDto { + @Data + @ApiModel("一级项目id") + public static class FirstProject{ + @NotNull + @ApiModelProperty("一级项目id") + private Long firstProjectId; + } + @Data @ApiModel("通过组别查找本单位注册的选手") public static class QueryPlayerByGroup{ 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 4889840f..22a8500c 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 @@ -52,8 +52,23 @@ public class ProvinceCompeteVo { @ApiModel("查找一级比赛项目信息") public static class FirstProject { @ApiModelProperty("一级项目id") - private Long parentProjectId; + private Long projectId; @ApiModelProperty("一级项目名字") - private String parentProjectName; + private String projectName; + } + + @Data + @ApiModel("根据一级项目id查找二级项目id") + public static class CompeteSecondProject { + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("名字") + private String name; + @ApiModelProperty("是否是团队项目 0否 1是") + private byte team; + @ApiModelProperty("最少人数") + private int memberMin; + @ApiModelProperty("最多人数") + private int memberMax; } } 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 cfeea0dd..91782031 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 @@ -45,4 +45,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return 返回一级项目信息 */ List queryFirstProjectByCompeteTimeId(@Param("type")int type); + + /** + * 查找二级项目 + * @param firstProjectId 一级项目id + * @return 返回二级项目信息 + */ + List queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId); } 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 c94aa184..35c06821 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -43,6 +43,14 @@ public interface IProvinceService { */ List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId); + /** + * 查找二级项目信息 + * @param param 二级项目信息 + * @param userId userId + * @return 返回二级项目信息 + */ + List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject 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 index b105f197..45e79c8f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -39,8 +39,6 @@ public class ProvinceService implements IProvinceService{ @Resource private Snowflake snowflake; @Resource - private CompetePlayerMapper playerMapper; - @Resource private CompeteTimeDao competeTimeDao; /** @@ -81,6 +79,12 @@ public class ProvinceService implements IProvinceService{ return firstProjects; } + @Override + public List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) { + List competeSecondProjects = competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId()); + return null; + } + /** * 添加或修改选手 */ 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 e67a885c..e3bf8ee4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -110,8 +110,8 @@ + \ No newline at end of file