c

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<ProvinceCompeteVo.CompeteCompany> getCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> 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<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());
+        ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyCoachList = provinceService.queryCoach(params.getParam());
-        log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach);
+        log.info("查找此单位的领队和教练信息：{}",competeCompanyCoachList);
-        return JsonResponse.newInstance().ok(competeCompanyCoach);
+        return JsonResponse.newInstance().ok(competeCompanyCoachList);
     }
 
     @MustLogin

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<CompeteCompanyCoach> competeCompanyCoachList;
+        @ApiModelProperty("领队信息")
+        private List<CompeteCompanyLeader> competeCompanyLeadersList;
+
+    }
+
+
     @Data
     @ApiModel("查询当前用户参赛单位基本信息")
     public static class PlayerInfo {

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

@@ -53,7 +53,11 @@ 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);
 
     /**

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);
 
     /**
      * 添加领队和教练信息

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);
+        CompeteCoachExample competeCoachExample = new CompeteCoachExample();
-        if (ObjectUtil.isNull(competeCoach)){
+        competeCoachExample.createCriteria().andCompanyIdEqualTo(company);
-            throw new BaseException(CodeEnum.PARAM_ERROR);
+        List<CompeteCoach> competeCoachList = competeCoachMapper.selectByExample(competeCoachExample);
-        }
+        ProvinceCompeteVo.CompeteCompanyCoach CompeteCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
-        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.setCoachName(competeCoach.getName());
-            competeCompanyCoach.setCoachId(competeCoach.getId());
+                    CompeteCompanyCoach.setCoachId(competeCoach.getId());
-            competeCompanyCoach.setGender(competeCoach.getGender());
+                    CompeteCompanyCoach.setGender(competeCoach.getGender());
-            competeCompanyCoach.setPhone(competeCoach.getPhone());
+                    CompeteCompanyCoach.setPhone(competeCoach.getPhone());
+                    competeCompanyCoachList.add(CompeteCompanyCoach);
+
+
         }else {
-            competeCompanyCoach.setGuideName(competeCoach.getName());
+            //给教练赋值
-            competeCompanyCoach.setCoachId(competeCoach.getId());
+                    competeCompanyLeader.setGuideName(competeCoach.getName());
-            competeCompanyCoach.setGender(competeCoach.getGender());
+                    competeCompanyLeader.setGuideId(competeCoach.getId());
-            competeCompanyCoach.setPhone(competeCoach.getPhone());
+                    competeCompanyLeader.setGender(competeCoach.getGender());
+                    competeCompanyLeader.setPhone(competeCoach.getPhone());
+                    competeCompanyLeadersList.add(competeCompanyLeader);
+        }
+            }
+            competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList);
+            competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList);
+
         }
-        return competeCompanyCoach;
+        return competeCompanyHeadList;
     }
 
     @Override

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

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