v1.2

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<ProvinceCompeteVo.CompeteCompany> getCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> 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<ProvinceCompeteDto.ModifyLeader> params){
         log.info("添加/修改单位信息：{}",params);
         provinceService.updateLeader(params.getParam());
@@ -130,16 +131,16 @@ public class ProvinceController {
         log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach);
         return JsonResponse.newInstance().ok(competeCompanyCoach);
     }
-
+//
-    @MustLogin
+//    @MustLogin
-    @ApiOperation(value = "保存领队和教练信息", notes = "")
+//    @ApiOperation(value = "保存领队和教练信息", notes = "")
-    @RequestMapping(value = "/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 saveCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
+//    public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
-        log.info("保存领队和教练信息：{}",params);
+//        log.info("保存领队和教练信息：{}",params);
-        provinceService.saveCoach(params.getParam());
+//        provinceService.saveCoach(params.getParam());
-        log.info("保存领队和教练信息：{}","插入成功");
+//        log.info("保存领队和教练信息：{}","插入成功");
-        return JsonResponse.newInstance().ok();
+//        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<ProvinceCompeteDto.JoinProject> params) {

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

@@ -54,7 +54,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
     List<ProvinceCompeteVo.CompeteSecondProject> 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);
 
     /**
      * 查看单位报名的项目的数量

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

@@ -147,16 +147,18 @@
 
     <select id="getCompany"  parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$CompeteCompany">
         select
-        name as companyName,
+        id as companyId,
+        `name` as companyName,
         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
         where user_id = #{userId}
         and compete_time_id = #{competeTimeId}
+        and rec_status = 0
     </select>
     <select id="getJoinProjectNum" resultType="java.lang.Integer">
         SELECT