20201106v1.0跳绳导出报表

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));
 //            //身份证反面

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common