Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
18056acd
Commit
18056acd
authored
Apr 25, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.3 特殊导入-优化-判断一下,身份证列,如果含有14个数字,且不符合刚刚的身份证规则,拦截。其余的非身份证行数据自动 忽略掉。
parent
51cbc4ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
5 deletions
+21
-5
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+21
-5
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
18056acd
...
...
@@ -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: 新版原表识别导入
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment