10-29

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

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

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -138,7 +138,7 @@ public class ProvinceCompeteVo {
     public static class CompeteCompanyHeadList {
         @ApiModelProperty("教练集合")
         private  List<CompeteCompanyCoach> competeCompanyCoachList;
-        @ApiModelProperty("领队信息")
+        @ApiModelProperty("领队集合")
         private List<CompeteCompanyLeader> competeCompanyLeadersList;
 
     }

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

@@ -322,6 +322,9 @@ public class ProvinceService implements IProvinceService {
             competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList);
             competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList);
 
+        }else {
+            competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList);
+            competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList);
         }
         return competeCompanyHeadList;
     }

mt/src/main/resources/application.yml

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