From dbc98f8d4290086cfcbf9033cbb30f0397ef145d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 10 Nov 2020 11:05:56 +0800 Subject: [PATCH] =?UTF-8?q?20201110mt=E6=9F=A5=E7=9C=8B=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=8F=82=E8=B5=9B=E7=9A=84=E9=80=89=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ProvinceController.java | 20 ++--- .../com/ccsens/mt/bean/dto/CompeteDto.java | 2 +- .../mt/bean/dto/ProvinceCompeteDto.java | 13 +++ .../com/ccsens/mt/bean/po/CompeteGroup.java | 11 +++ .../mt/bean/po/CompeteGroupExample.java | 60 +++++++++++++ .../com/ccsens/mt/bean/po/CompetePlayer.java | 11 +++ .../mt/bean/po/CompetePlayerExample.java | 60 +++++++++++++ .../mt/persist/dao/CompeteCompanyDao.java | 8 ++ .../ccsens/mt/service/IProvinceService.java | 7 ++ .../ccsens/mt/service/ProvinceService.java | 89 +++++++++++++------ mt/src/main/resources/druid-dev.yml | 2 +- .../mapper_dao/CompeteCompanyDao.xml | 21 +++++ .../mapper_raw/CompeteGroupMapper.xml | 25 ++++-- .../mapper_raw/CompetePlayerMapper.xml | 25 ++++-- .../tall/service/ProTaskDetailService.java | 10 +-- .../main/java/com/ccsens/util/CodeEnum.java | 3 +- 16 files changed, 311 insertions(+), 56 deletions(-) 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 86fc6f65..918b95ba 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -132,16 +132,6 @@ public class ProvinceController { log.info("查找此单位的领队和教练信息：{}",competeCompanyHeadList); return JsonResponse.newInstance().ok(competeCompanyHeadList); } -// -// @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 = "") @@ -191,4 +181,14 @@ public class ProvinceController { log.info("查询教练或领队的详细信息：{}",coachInfo); return JsonResponse.newInstance().ok(coachInfo); } + + @MustLogin + @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") + @RequestMapping(value = "/coachInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询教练或领队的详细信息：{}",params); + List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); + log.info("查询教练或领队的详细信息：{}",groupAndPlayer); + return JsonResponse.newInstance().ok(groupAndPlayer); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 35d18e31..3e9d1ab7 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -290,7 +290,7 @@ public class CompeteDto { } @Data - @ApiModel("项目id和组别id") + @ApiModel("要删除的选手id") public static class DelPlayer{ @NotNull @ApiModelProperty("选手id") diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index f57e3ab8..c4037cb6 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -51,6 +51,8 @@ public class ProvinceCompeteDto { private Long competeId; @ApiModelProperty("组别id") private Long groupId; + @ApiModelProperty("组别信息 1小学、2中学、3高职院校、4本科院校、5俱乐部") + private int groupRemark; @ApiModelProperty("选手姓名") private String playerName; @ApiModelProperty("性别 0女 1男") @@ -127,4 +129,15 @@ public class ProvinceCompeteDto { @ApiModelProperty("教练证") private Long coachCertificate; //教练证（只有教练需要，文件类型） } + + @Data + @ApiModel("查找团队项目下已参加的选手信息") + public static class GetPlayerByTeamProject{ + @NotNull(message = "请先填写基础信息") + @ApiModelProperty("参赛单位id") + private Long companyId; + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java index f25ad54e..5801522e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java @@ -30,6 +30,8 @@ public class CompeteGroup implements Serializable { private Byte minAge; + private Byte groupRemark; + private static final long serialVersionUID = 1L; public Long getId() { @@ -136,6 +138,14 @@ public class CompeteGroup implements Serializable { this.minAge = minAge; } + public Byte getGroupRemark() { + return groupRemark; + } + + public void setGroupRemark(Byte groupRemark) { + this.groupRemark = groupRemark; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -155,6 +165,7 @@ public class CompeteGroup implements Serializable { sb.append(", sex=").append(sex); sb.append(", maxAge=").append(maxAge); sb.append(", minAge=").append(minAge); + sb.append(", groupRemark=").append(groupRemark); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java index a2bba3a7..381b53c7 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java @@ -904,6 +904,66 @@ public class CompeteGroupExample { addCriterion("min_age not between", value1, value2, "minAge"); return (Criteria) this; } + + public Criteria andGroupRemarkIsNull() { + addCriterion("group_remark is null"); + return (Criteria) this; + } + + public Criteria andGroupRemarkIsNotNull() { + addCriterion("group_remark is not null"); + return (Criteria) this; + } + + public Criteria andGroupRemarkEqualTo(Byte value) { + addCriterion("group_remark =", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotEqualTo(Byte value) { + addCriterion("group_remark <>", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkGreaterThan(Byte value) { + addCriterion("group_remark >", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkGreaterThanOrEqualTo(Byte value) { + addCriterion("group_remark >=", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkLessThan(Byte value) { + addCriterion("group_remark <", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkLessThanOrEqualTo(Byte value) { + addCriterion("group_remark <=", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkIn(List values) { + addCriterion("group_remark in", values, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotIn(List values) { + addCriterion("group_remark not in", values, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkBetween(Byte value1, Byte value2) { + addCriterion("group_remark between", value1, value2, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotBetween(Byte value1, Byte value2) { + addCriterion("group_remark not between", value1, value2, "groupRemark"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java index 69412bf2..26349e0e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java @@ -48,6 +48,8 @@ public class CompetePlayer implements Serializable { private Long insuranceRecordFile; + private Byte groupRemark; + private static final long serialVersionUID = 1L; public Long getId() { @@ -226,6 +228,14 @@ public class CompetePlayer implements Serializable { this.insuranceRecordFile = insuranceRecordFile; } + public Byte getGroupRemark() { + return groupRemark; + } + + public void setGroupRemark(Byte groupRemark) { + this.groupRemark = groupRemark; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -254,6 +264,7 @@ public class CompetePlayer implements Serializable { sb.append(", studentRecordFile=").append(studentRecordFile); sb.append(", healthRecordFile=").append(healthRecordFile); sb.append(", insuranceRecordFile=").append(insuranceRecordFile); + sb.append(", groupRemark=").append(groupRemark); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java index 65d4bb9f..b23ee7ee 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java @@ -1484,6 +1484,66 @@ public class CompetePlayerExample { addCriterion("insurance_record_file not between", value1, value2, "insuranceRecordFile"); return (Criteria) this; } + + public Criteria andGroupRemarkIsNull() { + addCriterion("group_remark is null"); + return (Criteria) this; + } + + public Criteria andGroupRemarkIsNotNull() { + addCriterion("group_remark is not null"); + return (Criteria) this; + } + + public Criteria andGroupRemarkEqualTo(Byte value) { + addCriterion("group_remark =", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotEqualTo(Byte value) { + addCriterion("group_remark <>", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkGreaterThan(Byte value) { + addCriterion("group_remark >", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkGreaterThanOrEqualTo(Byte value) { + addCriterion("group_remark >=", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkLessThan(Byte value) { + addCriterion("group_remark <", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkLessThanOrEqualTo(Byte value) { + addCriterion("group_remark <=", value, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkIn(List values) { + addCriterion("group_remark in", values, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotIn(List values) { + addCriterion("group_remark not in", values, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkBetween(Byte value1, Byte value2) { + addCriterion("group_remark between", value1, value2, "groupRemark"); + return (Criteria) this; + } + + public Criteria andGroupRemarkNotBetween(Byte value1, Byte value2) { + addCriterion("group_remark not between", value1, value2, "groupRemark"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { 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 9bc2d22d..4e8260a1 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 @@ -93,4 +93,12 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return 返回详细信息 */ ProvinceCompeteVo.GetCoach getCoachInfo(@Param("coachId")Long coachId); + + /** + * 查找团队项目下的参赛选手信息 + * @param projectId + * @param type + * @return + */ + List getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index 7476d969..7d5111fa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -131,4 +131,11 @@ public interface IProvinceService { * @return 返回详细信息 */ ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param); + + /** + * 查找团队项目下已参加的选手信息 + * @param param 单位id和团体项目id + * @return 返回参加的选手的详细信息，按组别分类 + */ + List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); } 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 aa86061f..9a8066e6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -119,8 +119,9 @@ public class ProvinceService implements IProvinceService { CompetePlayer player = new CompetePlayer(); player.setId(snowflake.nextId()); player.setName(param.getPlayerName()); - player.setGender((byte) param.getGender()); + + if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); } //身份证不能为空，且正确 if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 @@ -129,14 +130,26 @@ public class ProvinceService implements IProvinceService { if(competePlayerDao.countByExample(competePlayerExample) != 0){ throw new BaseException(CodeEnum.ID_CARD_ALREADY); } - - if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); } - if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); } - //检查性别与组别是否匹配 - CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId()); - if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){ - throw new BaseException(CodeEnum.MT_NOT_GROUP); + //验证性别是否正确 + int gender = IdcardUtil.getGenderByIdCard(param.getIdCard()); + if(gender != param.getGender()){ + throw new BaseException(CodeEnum.GENDER_ERROR); } + //通过groupRemark和性别查找选手组别信息 + CompeteGroup competeGroup = new CompeteGroup(); + CompeteGroupExample competeGroupExample = new CompeteGroupExample(); + competeGroupExample.createCriteria().andSexEqualTo((byte) param.getGender()).andGroupRemarkEqualTo((byte) param.getGroupRemark()); + List groupList = competeGroupMapper.selectByExample(competeGroupExample); + if(CollectionUtil.isNotEmpty(groupList)){ + competeGroup = groupList.get(0); + } +// if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); } + +// //检查性别与组别是否匹配 +// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId()); +// if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){ +// throw new BaseException(CodeEnum.MT_NOT_GROUP); +// } //获取选手年龄 int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard()); //判断年龄和分组是否匹配 @@ -153,28 +166,17 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNull(param.getStudentRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("学籍证明")); } if(ObjectUtil.isNull(param.getHealthRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("健康证明")); } if(ObjectUtil.isNull(param.getInsuranceRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("保险证明")); } + player.setGender((byte) param.getGender()); player.setIdCard(param.getIdCard()); player.setCompanyId(param.getCompeteId()); player.setCompeteGroupId(param.getGroupId()); + player.setGroupRemark((byte) param.getGroupRemark()); player.setIdCardFrontFile(param.getIdCardFront()); player.setIdCardBackFile(param.getIdCardBack()); player.setIdPhotoFile(param.getIdPhone()); player.setStudentRecordFile(param.getStudentRecord()); player.setHealthRecordFile(param.getHealthRecord()); player.setInsuranceRecordFile(param.getInsuranceRecord()); - -// //添加身份证正面照片 -// player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId)); -// //身份证反面 -// player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId)); -// //一寸证件照 -// player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId)); -// //学籍证明 -// player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); -// //健康证明 -// player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); -// //保险证明 -// player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId)); competePlayerDao.insertSelective(player); log.info("新加参赛选手：{}",player); }else { @@ -182,6 +184,31 @@ public class ProvinceService implements IProvinceService { CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId()); log.info("查找需要修改的选手信息：{}",player); if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } + //身份证不能为空，且正确 + if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} + //是否已注册 + CompetePlayerExample competePlayerExample = new CompetePlayerExample(); + competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId()); + if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);} + //验证性别是否正确 + int gender = IdcardUtil.getGenderByIdCard(param.getIdCard()); + if(gender != param.getGender()){ + throw new BaseException(CodeEnum.GENDER_ERROR); + } + //通过groupRemark和性别查找选手组别信息 + CompeteGroup competeGroup = new CompeteGroup(); + CompeteGroupExample competeGroupExample = new CompeteGroupExample(); + competeGroupExample.createCriteria().andSexEqualTo((byte) param.getGender()).andGroupRemarkEqualTo((byte) param.getGroupRemark()); + List groupList = competeGroupMapper.selectByExample(competeGroupExample); + if(CollectionUtil.isNotEmpty(groupList)){ + competeGroup = groupList.get(0); + } + //获取选手年龄 + int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard()); + //判断年龄和分组是否匹配 + if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){ + throw new BaseException(CodeEnum.MT_NOT_GROUP); + } //字段不为空则修改 if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());} if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} @@ -195,13 +222,6 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());} if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());} if(ObjectUtil.isNotNull(param.getInsuranceRecord())){player.setInsuranceRecordFile(param.getInsuranceRecord());} - -// if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));} -// if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));} -// if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));} -// if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} -// if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} -// if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));} competePlayerDao.updateByPrimaryKeySelective(player); } } @@ -606,5 +626,18 @@ public class ProvinceService implements IProvinceService { public ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param) { return competeCompanyDao.getCoachInfo(param.getCoachId()); } + + /** + * 查找团体项目下的参赛选手信息 + */ + @Override + public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { + //查找项目 + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + if(ObjectUtil.isNotNull(competeProject)){ + List groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); + } + return null; + } } diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml index 8b496426..5676a291 100644 --- a/mt/src/main/resources/druid-dev.yml +++ b/mt/src/main/resources/druid-dev.yml @@ -32,4 +32,4 @@ spring: username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME - env: CCSENS_TALL \ No newline at end of file + env: CCSENS_TALL diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 0cab33f8..48077005 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -232,6 +232,27 @@ WHERE id = #{coachId} + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml b/mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml index 9831411f..6be0336f 100644 --- a/mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml @@ -15,6 +15,7 @@ + @@ -76,7 +77,7 @@ id, group_name, description, start_age, end_age, sequence, type, created_at, updated_at, - rec_status, sex, max_age, min_age + rec_status, sex, max_age, min_age, group_remark @@ -253,6 +260,9 @@ min_age = #{record.minAge,jdbcType=TINYINT}, + + group_remark = #{record.groupRemark,jdbcType=TINYINT}, + @@ -272,7 +282,8 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, sex = #{record.sex,jdbcType=TINYINT}, max_age = #{record.maxAge,jdbcType=TINYINT}, - min_age = #{record.minAge,jdbcType=TINYINT} + min_age = #{record.minAge,jdbcType=TINYINT}, + group_remark = #{record.groupRemark,jdbcType=TINYINT} @@ -316,6 +327,9 @@ min_age = #{minAge,jdbcType=TINYINT}, + + group_remark = #{groupRemark,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -332,7 +346,8 @@ rec_status = #{recStatus,jdbcType=TINYINT}, sex = #{sex,jdbcType=TINYINT}, max_age = #{maxAge,jdbcType=TINYINT}, - min_age = #{minAge,jdbcType=TINYINT} + min_age = #{minAge,jdbcType=TINYINT}, + group_remark = #{groupRemark,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml b/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml index 1488ee21..bbcc90d4 100644 --- a/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml @@ -24,6 +24,7 @@ + @@ -87,7 +88,7 @@ id, user_id, name, id_card, phone, gender, id_card_front, id_card_back, prove_img, compete_group_id, company_id, authorization, created_at, updated_at, rec_status, compete_time_id, id_card_front_file, id_card_back_file, id_photo_file, student_record_file, - health_record_file, insurance_record_file + health_record_file, insurance_record_file, group_remark @@ -351,6 +358,9 @@ insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT}, + + group_remark = #{record.groupRemark,jdbcType=TINYINT}, + @@ -379,7 +389,8 @@ id_photo_file = #{record.idPhotoFile,jdbcType=BIGINT}, student_record_file = #{record.studentRecordFile,jdbcType=BIGINT}, health_record_file = #{record.healthRecordFile,jdbcType=BIGINT}, - insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT} + insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT}, + group_remark = #{record.groupRemark,jdbcType=TINYINT} @@ -450,6 +461,9 @@ insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT}, + + group_remark = #{groupRemark,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -475,7 +489,8 @@ id_photo_file = #{idPhotoFile,jdbcType=BIGINT}, student_record_file = #{studentRecordFile,jdbcType=BIGINT}, health_record_file = #{healthRecordFile,jdbcType=BIGINT}, - insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT} + insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT}, + group_remark = #{groupRemark,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 122977fd..fbe80a26 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -201,11 +201,11 @@ public class ProTaskDetailService implements IProTaskDetailService { List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, firstTaskDetail.getId(), startTime, endTime, roleId); if (CollectionUtil.isNotEmpty(secondNormalTaskList)) { for (TaskVo.NormalTask task : secondNormalTaskList) { - //处理分数 - BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(), task.getDetailId()); - if (ObjectUtil.isNotNull(score)) { - task.setScore(score); - } +// //处理分数 +// BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(), task.getDetailId()); +// if (ObjectUtil.isNotNull(score)) { +// task.setScore(score); +// } //处理插件 managePlugin(currentUserId, roleId, task, imitation); //二级任务完成状态 diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 1ec281e0..9d96e5ce 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -173,7 +173,8 @@ public enum CodeEnum { NOT_COMPANY(142,"请先填写基础信息",true), MT_NOT_GROUP(143,"请选择正确的组别信息",true), CONTACTS_NAME_EMPTY(144,"联系人名称不能为空",true), - MEMBER_NUM_ERROR(144,"参赛人数不满足比赛人数要求",true), + MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true), + GENDER_ERROR(146,"请选择正确的性别",true), ;