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 e60abed7..a2ba2621 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -93,6 +93,7 @@ public class ProvinceController { return JsonResponse.newInstance().ok(playerByCompanyIds); } + @MustLogin @ApiOperation(value = "查询当前用户参赛单位基本信息", notes = "") @RequestMapping(value = "/get/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getCompany(@ApiParam @Validated @RequestBody QueryDto params) { @@ -113,7 +114,7 @@ public class ProvinceController { } @MustLogin @ApiOperation(value ="添加/修改领队或教练",notes = "") - @RequestMapping(value = "/province/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/save/coach",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) public JsonResponse updataLeader(@ApiParam @Validated @RequestBody QueryDto params){ log.info("添加/修改单位信息:{}",params); provinceService.updateLeader(params.getParam()); @@ -130,16 +131,16 @@ public class ProvinceController { log.info("查找此单位的领队和教练信息:{}",competeCompanyCoach); return JsonResponse.newInstance().ok(competeCompanyCoach); } - - @MustLogin - @ApiOperation(value = "保存领队和教练信息", notes = "") - @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("保存领队和教练信息:{}",params); - provinceService.saveCoach(params.getParam()); - log.info("保存领队和教练信息:{}","插入成功"); - return JsonResponse.newInstance().ok(); - } +// +// @MustLogin +// @ApiOperation(value = "保存领队和教练信息", notes = "") +// @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto params) { +// log.info("保存领队和教练信息:{}",params); +// provinceService.saveCoach(params.getParam()); +// log.info("保存领队和教练信息:{}","插入成功"); +// return JsonResponse.newInstance().ok(); +// } @MustLogin @ApiOperation(value = "删除领队和教练信息", notes = "") @@ -151,7 +152,7 @@ public class ProvinceController { return JsonResponse.newInstance().ok(); } - + @MustLogin @ApiOperation(value = "参加比赛", notes = "") @RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse playerJoinProject(@ApiParam @Validated @RequestBody QueryDto params) { 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 c6195f1f..eff3c0b2 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 @@ -54,7 +54,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { List queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId); - ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")long competeTimeId,@Param("userId")long userId); + ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")Long competeTimeId,@Param("userId")Long userId); /** * 查看单位报名的项目的数量 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 b5782cb7..28325042 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -147,16 +147,18 @@