From 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 六月 2021 09:57:09 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
index feac593..6e82587 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
@@ -56,7 +56,9 @@
List<T> repeatEles = new ArrayList<T>();
for (T t : datas) {
if (set.contains(t)) {
- repeatEles.add(t);
+ if(!repeatEles.contains(t)) {
+ repeatEles.add(t);
+ }
} else {
set.add(t);
}
@@ -79,8 +81,15 @@
throw new ServiceException("身份证号错误");
}
- eldersAuthElderlyExcelVO.setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(eldersAuthElderlyExcelVO.getIdCard())));
- eldersAuthElderlyExcelVO.setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(eldersAuthElderlyExcelVO.getIdCard())));
+ String idCard = eldersAuthElderlyExcelVO.getIdCard();
+ if(idCard!=null && idCard.contains("x")){
+ idCard = idCard.replaceAll("x", "X");
+ }
+ eldersAuthElderlyExcelVO.setIdCard(idCard);
+
+ eldersAuthElderlyExcelVO.setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(idCard)));
+ eldersAuthElderlyExcelVO.setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(idCard)));
+
list.add(eldersAuthElderlyExcelVO);
// 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
if(list.size() >= BATCH_COUNT){
--
Gitblit v1.7.1