From a9714988000ecf12c0e069f2f21aa449e3512108 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 16 四月 2021 18:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index b6fbc7f..6dde499 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -93,22 +93,17 @@
}
vo.setCardNo(oneData.get(1));
//根据身份证号码解析年龄以及性别
- if(IdCardUtil.strongVerifyIdNumber(vo.getCardNo())){
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- //设置用户年龄
- vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ //设置用户年龄
+ vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
}else{
- throw new ServiceException("500", "身份证号码有误:第" + index + "行,第3列");
+ vo.setSex(PopulSexEnum.nv.getCode());
}
-
if(oneData.get(2) != null){
vo.setNation(oneData.get(2));
}
--
Gitblit v1.7.1