20201030开始测试用例测试

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

@@ -126,7 +126,7 @@ 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());
         log.info("查找此单位的领队和教练信息：{}",competeCompanyCoachList);
@@ -175,10 +175,20 @@ public class ProvinceController {
     @MustLogin
     @ApiOperation(value = "选手详细信息", notes = "")
     @RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse  getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.DelPlayer> params) {
+    public JsonResponse<ProvinceCompeteVo.PlayerInfo>  getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.DelPlayer> params) {
         log.info("选手详细信息：{}",params);
         ProvinceCompeteVo.PlayerInfo playerInfo = provinceService.getPlayerInfo(params.getParam());
         log.info("选手详细信息：{}",playerInfo);
         return JsonResponse.newInstance().ok(playerInfo);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查询教练或领队的详细信息", notes = "")
+    @RequestMapping(value = "/coachInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ProvinceCompeteVo.GetCoach>  getCoachInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.LeaderId> params) {
+        log.info("查询教练或领队的详细信息：{}",params);
+        ProvinceCompeteVo.GetCoach coachInfo = provinceService.getCoachInfo(params.getParam());
+        log.info("查询教练或领队的详细信息：{}",coachInfo);
+        return JsonResponse.newInstance().ok(coachInfo);
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -250,33 +250,33 @@ public class CompeteDto {
         private int authorization;
     }
 
-    @Data
-    @ApiModel("当前用户参赛单位基本信息")
-    public static class AddCoach{
-        @ApiModelProperty("参赛单位id")
-        private Long companyId;
-        @ApiModelProperty("教练或领队的id，有则修改，没有则添加")
-        private Long coachId;
-        @ApiModelProperty("身份: 0领队 1教练")
-        private int identity;
-        @ApiModelProperty("姓名")
-        private String name;
-        @ApiModelProperty("性别")
-        private int gender;
-        @ApiModelProperty("手机号")
-        private String phone;
-        @ApiModelProperty("身份证号")
-        private String  idCard;
-        @ApiModelProperty("证件照（文件类型")
-        private Long idPhoto;
-        @ApiModelProperty("教练证（只有教练需要，文件类型")
-        private Long coachCertificate;
-    }
+//    @Data
+//    @ApiModel("当前用户参赛单位基本信息")
+//    public static class AddCoach{
+//        @ApiModelProperty("参赛单位id")
+//        private Long companyId;
+//        @ApiModelProperty("教练或领队的id，有则修改，没有则添加")
+//        private Long coachId;
+//        @ApiModelProperty("身份: 0领队 1教练")
+//        private int identity;
+//        @ApiModelProperty("姓名")
+//        private String name;
+//        @ApiModelProperty("性别")
+//        private int gender;
+//        @ApiModelProperty("手机号")
+//        private String phone;
+//        @ApiModelProperty("身份证号")
+//        private String  idCard;
+//        @ApiModelProperty("证件照（文件类型")
+//        private Long idPhoto;
+//        @ApiModelProperty("教练证（只有教练需要，文件类型")
+//        private Long coachCertificate;
+//    }
 
     @Data
     @ApiModel("领队id")
     public static class LeaderId{
-        @ApiModelProperty("教练或领队的id，有则修改，没有则添加")
+        @ApiModelProperty("教练或领队的id")
         private Long coachId;
 
     }

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -108,7 +108,7 @@ public class ProvinceCompeteDto {
     @ApiModel("添加/修改领队或教练")
     public static class  ModifyLeader{
         @ApiModelProperty("参赛单位id")
-        private Long  companyId; //参赛单位id
+        private Long companyId; //参赛单位id
         @ApiModelProperty("教练或领队的id")
         private Long coachId; //教练或领队的id，有则修改，没有则添加
         @ApiModelProperty("身份: 0领队 1教练")

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

@@ -172,4 +172,28 @@ public class ProvinceCompeteVo {
         @ApiModelProperty("保险证明（浏览路径）")
         private String insuranceRecord;
     }
+
+
+    @Data
+    @ApiModel("查找性对或教练的详细基本信息")
+    public static class GetCoach{
+        @ApiModelProperty("教练或领队的id，有则修改，没有则添加")
+        private Long coachId;
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @ApiModelProperty("身份: 0领队 1教练")
+        private int identity;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("性别")
+        private int gender;
+        @ApiModelProperty("手机号")
+        private String phone;
+        @ApiModelProperty("身份证号")
+        private String  idCard;
+        @ApiModelProperty("证件照（浏览路径）")
+        private Long idPhoto;
+        @ApiModelProperty("教练证（浏览路径）")
+        private Long coachCertificate;
+    }
 }

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

@@ -86,4 +86,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      * @return 参加的数量
      */
     int getTeamNumByPlayerId(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId);
+
+    /**
+     * 查看教练或领队的详细信息
+     * @param coachId 教练或领队的id
+     * @return 返回详细信息
+     */
+    ProvinceCompeteVo.GetCoach getCoachInfo(@Param("coachId")Long coachId);
 }

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

@@ -88,13 +88,13 @@ public interface IProvinceService {
      */
     ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo param);
 
-    /**
-     * 添加领队和教练信息
-     * @param
-     * @param
-     * @return
-     */
-    void saveCoach(CompeteDto.AddCoach param);
+//    /**
+//     * 添加领队和教练信息
+//     * @param
+//     * @param
+//     * @return
+//     */
+//    void saveCoach(CompeteDto.AddCoach param);
 
     /**
      * 删除领队和教练信息
@@ -125,4 +125,10 @@ public interface IProvinceService {
      */
     ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param);
 
+    /**
+     * 查看领队或教练的详细信息
+     * @param param 领队或教练的id
+     * @return 返回详细信息
+     */
+    ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param);
 }

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

@@ -294,14 +294,18 @@ public class ProvinceService implements IProvinceService {
         CompeteCoachExample competeCoachExample = new CompeteCoachExample();
         competeCoachExample.createCriteria().andCompanyIdEqualTo(company);
         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();
+
+//        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){
+                    ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
             //给领队赋值
                     competeCompanyCoach.setCoachName(competeCoach.getName());
                     competeCompanyCoach.setCoachId(competeCoach.getId());
@@ -311,6 +315,7 @@ public class ProvinceService implements IProvinceService {
 
 
                 }else {
+                    ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader();
                     //给教练赋值
                     competeCompanyLeader.setGuideName(competeCoach.getName());
                     competeCompanyLeader.setGuideId(competeCoach.getId());
@@ -326,29 +331,29 @@ public class ProvinceService implements IProvinceService {
         return competeCompanyHeadList;
     }
 
-    @Override
-    public void saveCoach(CompeteDto.AddCoach param) {
-        CompeteCoach competeCoach = new CompeteCoach();
-        Long companyId = param.getCompanyId();
-        competeCoach.setCompanyId(companyId);
-        Long cpachId = param.getCoachId();
-        competeCoach.setId(cpachId);
-        int identity = param.getIdentity();
-        competeCoach.setIdentity((byte) identity);
-        String name = param.getName();
-        competeCoach.setName(name);
-        int gender = param.getGender();
-        competeCoach.setGender((byte) gender);
-        String phone = param.getPhone();
-        competeCoach.setPhone(phone);
-        String idCard = param.getIdCard();
-        competeCoach.setIdCard(idCard);
-        Long idPhoto = param.getIdPhoto();
-        competeCoach.setIdPhoto(idPhoto);
-        Long coachCertificate = param.getCoachCertificate();
-        competeCoach.setCoachCertificate(coachCertificate);
-        competeCoachMapper.insertSelective(competeCoach);
-    }
+//    @Override
+//    public void saveCoach(CompeteDto.AddCoach param) {
+//        CompeteCoach competeCoach = new CompeteCoach();
+//        Long companyId = param.getCompanyId();
+//        competeCoach.setCompanyId(companyId);
+//        Long cpachId = param.getCoachId();
+//        competeCoach.setId(cpachId);
+//        int identity = param.getIdentity();
+//        competeCoach.setIdentity((byte) identity);
+//        String name = param.getName();
+//        competeCoach.setName(name);
+//        int gender = param.getGender();
+//        competeCoach.setGender((byte) gender);
+//        String phone = param.getPhone();
+//        competeCoach.setPhone(phone);
+//        String idCard = param.getIdCard();
+//        competeCoach.setIdCard(idCard);
+//        Long idPhoto = param.getIdPhoto();
+//        competeCoach.setIdPhoto(idPhoto);
+//        Long coachCertificate = param.getCoachCertificate();
+//        competeCoach.setCoachCertificate(coachCertificate);
+//        competeCoachMapper.insertSelective(competeCoach);
+//    }
 
     @Override
     public void deleteCoach(CompeteDto.LeaderId param) {
@@ -559,28 +564,17 @@ public class ProvinceService implements IProvinceService {
                     teamMember.setPlayerId(player.getId());
                     teamMemberMapper.insertSelective(teamMember);
                 }
-//                //检查该选手报名项目数量
-//                int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId());
-//                if(a >= 6){
-//                    throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
-//                }
-//                //团队性别组根据参赛成员而定
-//                if (i == 0){
-//                    competeTeam.setGenderGroup(player.getGender());
-//                }else {
-//                    if(!competeTeam.getGenderGroup().equals(player.getGender())){
-//                        competeTeam.setGenderGroup((byte) 2);
-//                    }
-//                }
-//                //添加成员表
-//                CompeteTeamMember teamMember = new CompeteTeamMember();
-//                teamMember.setId(snowflake.nextId());
-//                teamMember.setCompeteTeamId(competeTeam.getId());
-//                teamMember.setPlayerId(player.getId());
-//                teamMemberMapper.insertSelective(teamMember);
             }
 
         }
     }
+
+    /**
+     * 查找教练详细信息
+     */
+    @Override
+    public ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param) {
+        return competeCompanyDao.getCoachInfo(param.getCoachId());
+    }
 }
 

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -68,10 +68,10 @@
         cg.type = #{type}
         and cg.rec_status = 0
         <if test="groupId != null">
-        and(p.company_id = #{companyId} or p.company_id is null)
-        </if>
         AND (p.compete_group_id =#{groupId} or p.compete_group_id is null)
-        AND (p.rec_status = 0 or p.rec_status is null)
+        </if>
+        and(p.company_id = #{companyId} or p.company_id is null)
+        AND (p.rec_status = 0)
      </select>
     <select id="queryProjectByCompeteTimeId"  resultMap="compete_project">
         SELECT
@@ -207,6 +207,22 @@
         and t.rec_status = 0
         and m.rec_status = 0
     </select>
+    <select id="getCoachInfo" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$GetCoach">
+        SELECT
+        id as coachId,
+        company_id as companyId,
+        identity,
+        `name`,
+        gender,
+        phone,
+        id_card,
+        (SELECT visit_location FROM t_common_file WHERE id = id_photo) as idPhoto,
+        (SELECT visit_location FROM t_common_file WHERE id = coach_certificate) as coachCertificate
+        FROM
+        t_compete_coach
+        WHERE
+        id = #{coachId}
+    </select>
 
 
 </mapper>

tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java

@@ -111,7 +111,7 @@ public class UserDto {
         @NotEmpty(message = "密码不能为空")
         @Pattern(regexp="^[a-zA-Z0-9._-]{6,20}$",message="密码长度需在6~20之间，不能使用汉字，不能包含特殊字符")
         private String password;
-        @ApiModelProperty("来源 0：默认注册，1：HT病人注册,2绿谷注册")
+        @ApiModelProperty("来源 0：默认注册，1:跳绳")
         private byte source = WebConstant.Regist.SOURCE;
     }