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
ec9092bb
Commit
ec9092bb
authored
Apr 16, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.2-工资原表识别-优化
parent
e2c1b315
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+10
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
ec9092bb
...
...
@@ -695,7 +695,16 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
title
=
vo
.
getTitleList
().
get
(
i
);
if
(
Common
.
isNotNull
(
title
.
getContent
()))
{
if
(
detailMap
.
get
(
String
.
valueOf
(
title
.
getLineNum
()))
==
null
)
{
return
R
.
failed
(
"表头与导入的不一致,第"
+
title
.
getLineNum
()
+
"列表头【"
+
title
.
getContent
()
+
"】未找到配置,请先配置表头!"
);
if
(!
"是否新员工(默认否)"
.
equals
(
title
.
getContent
())
&&
!
"开户行总行"
.
equals
(
title
.
getContent
())
&&
!
"开户行省"
.
equals
(
title
.
getContent
())
&&
!
"开户行市"
.
equals
(
title
.
getContent
())
&&
!
"开户行支行"
.
equals
(
title
.
getContent
())
&&
!
"银行卡号"
.
equals
(
title
.
getContent
())
&&
!
"手机号码"
.
equals
(
title
.
getContent
())
&&
!
"计税月份"
.
equals
(
title
.
getContent
()))
{
return
R
.
failed
(
"表头与导入的不一致,第"
+
title
.
getLineNum
()
+
"列表头【"
+
title
.
getContent
()
+
"】未找到配置,请先配置表头!"
);
}
}
else
if
(!
title
.
getContent
().
equals
(
detailMap
.
get
(
String
.
valueOf
(
title
.
getLineNum
())).
getExcelName
())
&&
(!
"是否新员工(默认否)"
.
equals
(
title
.
getContent
())
||
!
"开户行总行"
.
equals
(
title
.
getContent
())
...
...
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