20201028V1.1

mt/src/main/java/com/ccsens/mt/api/ProvinceController.java

@@ -64,16 +64,16 @@ public class ProvinceController {
         return JsonResponse.newInstance().ok(projectList);
     }
 
-//    @MustLogin
+    @MustLogin
-//    @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "")
+    @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "")
-//    @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-//    public JsonResponse<List<CompeteVo.CompeteProject>> queryProjectByFirstProject(
+    public JsonResponse<List<ProvinceCompeteVo.CompeteSecondProject>> queryProjectByFirstProject(
-//            @ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
+            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.FirstProject> params) {
-//        log.info("查找二级比赛项目的信息：{}",params);
+        log.info("查找二级比赛项目的信息：{}",params);
-//        List<CompeteVo.CompeteProject> projectList = provinceService.queryProjectByCompeteTimeId(params.getParam(),params.getUserId());
+        List<ProvinceCompeteVo.CompeteSecondProject> projectList = provinceService.queryProjectByFirstProject(params.getParam(),params.getUserId());
-//        log.info("查找二级比赛项目的信息：{}",projectList);
+        log.info("查找二级比赛项目的信息：{}",projectList);
-//        return JsonResponse.newInstance().ok(projectList);
+        return JsonResponse.newInstance().ok(projectList);
-//    }
+    }
 
     @MustLogin
     @ApiOperation(value = "新加/修改参赛人员", notes = "")

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{

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;
     }
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java

@@ -45,4 +45,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      * @return 返回一级项目信息
      */
     List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(@Param("type")int type);
+
+    /**
+     * 查找二级项目
+     * @param firstProjectId 一级项目id
+     * @return 返回二级项目信息
+     */
+    List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId);
 }

mt/src/main/java/com/ccsens/mt/service/IProvinceService.java

@@ -43,6 +43,14 @@ public interface IProvinceService {
      */
     List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId);
 
+    /**
+     * 查找二级项目信息
+     * @param param 二级项目信息
+     * @param userId userId
+     * @return 返回二级项目信息
+     */
+    List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId);
+
 
     /**
      * 添加或修改选手

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<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
+        List<ProvinceCompeteVo.CompeteSecondProject> competeSecondProjects = competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
+        return null;
+    }
+
     /**
      * 添加或修改选手
      */

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: common, util-test
+    include: common, util-dev

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -110,8 +110,8 @@
     </select>
     <select id="queryFirstProjectByCompeteTimeId" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$FirstProject">
         SELECT
-        p.id as parentProjectId,
+        p.id as projectId,
-        p.`name` as parentProjectName
+        p.`name` as projectName
         FROM
         t_compete_project p
         where
@@ -120,4 +120,18 @@
         and p.rec_status = 0
 
     </select>
+    <select id="queryProjectByFirstProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$CompeteSecondProject">
+       	SELECT
+        p.id as id,
+        p.`name` as `name`,
+        team,
+        member_min as memberMin,
+        member_max as memberMax
+        FROM
+        t_compete_project p
+        where
+        p.parent_id = #{firstProjectId}
+        and p.level = 2
+        and p.rec_status = 0
+    </select>
 </mapper>