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
288afaa9
Commit
288afaa9
authored
Apr 23, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.3 特殊导入
parent
93e3b20b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
16 deletions
+18
-16
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+18
-16
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
288afaa9
...
...
@@ -853,12 +853,13 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
detail
=
detailMap
.
get
(
column
.
getKey
());
if
(
detail
!=
null
&&
Common
.
isNotNull
(
detail
.
getModelName
()))
{
value
=
column
.
getValue
();
if
(
Common
.
isNotNull
(
value
))
{
try
{
if
(
"REDUCE"
.
equals
(
detail
.
getFlag
()))
{
value
=
String
.
valueOf
(
new
BigDecimal
(
value
).
negate
());
}
oldValue
=
newRowMap
.
get
(
detail
.
getModelName
());
if
(
oldValue
!=
null
)
{
if
(
Common
.
isNotNull
(
oldValue
)
)
{
value
=
String
.
valueOf
(
new
BigDecimal
(
oldValue
).
add
(
new
BigDecimal
(
value
))
.
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
));
}
...
...
@@ -874,6 +875,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
}
}
}
if
(
Common
.
isEmpty
(
check
.
getIdCard
()))
{
return
R
.
failed
(
"数据行第 "
+
i
+
" 行,无身份证号!"
);
}
...
...
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