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
fbc48bfd
Commit
fbc48bfd
authored
Sep 13, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.10工资相关
parent
5e5719ed
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+4
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
fbc48bfd
...
...
@@ -976,12 +976,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
if
(
Common
.
isNotNull
(
curValue
))
{
repetitiveKey
.
append
(
key
).
append
(
";"
);
}
else
{
notFixedKeyMap
.
remove
(
key
);
curMap
.
put
(
key
,
1
);
}
// 存储适配map,以做识别内容
detailMap
.
put
(
String
.
valueOf
(
title
.
getLineNum
()),
entry
.
getValue
());
notFixedKeyMap
.
remove
(
key
);
break
;
// 这里加上截断,就有可能关注不到重复的配置过的表头了:
// break
}
}
detailSet
=
detailMap
.
get
(
String
.
valueOf
(
title
.
getLineNum
()));
...
...
@@ -1001,7 +1002,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
if
(
notFixedKeyMap
.
size
()
>
0
)
{
StringBuilder
titles
=
new
StringBuilder
();
for
(
String
keyStr
:
notFixed
Title
Map
.
keySet
())
{
for
(
String
keyStr
:
notFixed
Key
Map
.
keySet
())
{
titles
.
append
(
keyStr
).
append
(
";"
);
}
return
R
.
failed
(
"配置的表头未找到:"
+
titles
);
...
...
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