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 5a1d8ceb..321b0532 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/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 queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查找此单位的领队和教练信息:{}",params); - ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyCoachList = provinceService.queryCoach(params.getParam()); - log.info("查找此单位的领队和教练信息:{}",competeCompanyCoachList); - return JsonResponse.newInstance().ok(competeCompanyCoachList); + ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = provinceService.queryCoach(params.getParam()); + log.info("查找此单位的领队和教练信息:{}",competeCompanyHeadList); + return JsonResponse.newInstance().ok(competeCompanyHeadList); } // // @MustLogin 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 42204d34..2a842efa 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 @@ -138,7 +138,7 @@ public class ProvinceCompeteVo { public static class CompeteCompanyHeadList { @ApiModelProperty("教练集合") private List competeCompanyCoachList; - @ApiModelProperty("领队信息") + @ApiModelProperty("领队集合") private List competeCompanyLeadersList; } 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 c5fe8621..97634dcc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/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; } 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