From dc1a49110695832cd7379b837bcbce1f2bb862ab Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 6 Nov 2020 11:17:33 +0800
Subject: [PATCH] =?UTF-8?q?20201106v1.0=E8=B7=B3=E7=BB=B3=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/mt/service/ProvinceService.java   | 7 +++++++
 tall/src/main/resources/application.yml                    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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 027c0496..434a0337 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
@@ -146,6 +146,12 @@ public class ProvinceService implements IProvinceService {
             if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){
                 throw new BaseException(CodeEnum.MT_NOT_GROUP);
             }
+            //获取选手年龄
+            int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard());
+            //判断年龄和分组是否匹配
+            if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){
+                throw new BaseException(CodeEnum.MT_NOT_GROUP);
+            }
             //判断各种证件是否为空
             if(ObjectUtil.isNull(param.getIdCardFront()) && ObjectUtil.isNotNull(param.getIdCardBack())){
                 param.setIdCardFront(param.getIdCardBack());
@@ -165,6 +171,7 @@ public class ProvinceService implements IProvinceService {
             player.setStudentRecordFile(param.getStudentRecord());
             player.setHealthRecordFile(param.getHealthRecord());
             player.setInsuranceRecordFile(param.getInsuranceRecord());
+
 //            //添加身份证正面照片
 //            player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
 //            //身份证反面
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index e75cc2c3..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common