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
5da06006
Commit
5da06006
authored
Aug 05, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.14-薪资人员导入校验优化
parent
214c3da1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
156 additions
and
22 deletions
+156
-22
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+148
-22
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+8
-0
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
5da06006
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
5da06006
...
@@ -830,6 +830,10 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -830,6 +830,10 @@ public class SalaryAccountUtil implements Serializable {
String
areaInt
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
emp
.
getBankProvince
().
trim
());
String
areaInt
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
emp
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaInt
))
{
if
(
Common
.
isNotNull
(
areaInt
))
{
entity
.
setBankProvince
(
areaInt
);
entity
.
setBankProvince
(
areaInt
);
}
else
{
error
=
"第"
+
i
+
SalaryConstants
.
LINE_EMP
+
emp
.
getEmpIdcard
()
+
"-开户行省错误,请在工资模板正确填写!"
;
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
true
;
}
}
String
areaCityInt
=
null
;
String
areaCityInt
=
null
;
if
(
Common
.
isNotNull
(
emp
.
getBankCity
()))
{
if
(
Common
.
isNotNull
(
emp
.
getBankCity
()))
{
...
@@ -837,6 +841,10 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -837,6 +841,10 @@ public class SalaryAccountUtil implements Serializable {
+
CommonConstants
.
DOWN_LINE_STRING
+
emp
.
getBankProvince
().
trim
());
+
CommonConstants
.
DOWN_LINE_STRING
+
emp
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaCityInt
))
{
if
(
Common
.
isNotNull
(
areaCityInt
))
{
entity
.
setBankCity
(
areaCityInt
);
entity
.
setBankCity
(
areaCityInt
);
}
else
{
error
=
"第"
+
i
+
SalaryConstants
.
LINE_EMP
+
emp
.
getEmpIdcard
()
+
"-开户行市错误或开户行市不在开户行省内,请在工资模板正确填写!"
;
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
return
true
;
}
}
}
}
}
}
...
...
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