Commit 18056acd authored by hongguangwu's avatar hongguangwu

MVP1.6.3 特殊导入-优化-判断一下,身份证列,如果含有14个数字,且不符合刚刚的身份证规则,拦截。其余的非身份证行数据自动 忽略掉。

parent 51cbc4ab
......@@ -371,9 +371,11 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if (Common.isEmpty(idCardValue)) {
idCardNullNum++;
}
if (Common.isNotNull(idCardValue) && (regIdCard(idCardValue))
if (Common.isNotNull(idCardValue) && (
regIdCard(idCardValue)
// 特殊身份证允许识别
|| regSpecialIdCard(idCardValue, specialIdCardList)) {
|| regSpecialIdCard(idCardValue, specialIdCardList)
|| regIdCardError(idCardValue) )) {
contentList.add(contentMap);
}
}
......@@ -650,9 +652,11 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if (Common.isEmpty(idCardValue)) {
idCardNullNum++;
}
if (Common.isNotNull(idCardValue) && (regIdCard(idCardValue))
// 特殊身份证允许识别
|| regSpecialIdCard(idCardValue, specialIdCardList)) {
if (Common.isNotNull(idCardValue) && (
regIdCard(idCardValue)
// 特殊身份证允许识别
|| regSpecialIdCard(idCardValue, specialIdCardList)
|| regIdCardError(idCardValue) )) {
contentList.add(contentMap);
}
}
......@@ -733,6 +737,18 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return flag;
}
/**
* @param content
* @Description: 判断类似身份证的数据,进识别行,提示客服该行错误:14位数字
* 格式正确返回true
* @Author: hgw
* @Date: 2022/5/13 11:53
* @return: boolean
**/
private static boolean regIdCardError(String content) {
return content.matches(".*\\b\\d{14}\\b.*");
}
/**
* @param excelVo
* @Description: 新版原表识别导入
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment