Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
7ed9030e
Commit
7ed9030e
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
8402e3a8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
21 deletions
+21
-21
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+21
-21
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
7ed9030e
...
...
@@ -3395,25 +3395,25 @@ public class SalaryManagementController {
XcglAssoZxfjkc
xcglas
=
XcglAssoZxfjkc
.
builder
().
build
();
xcglas
.
setUserid
(
ygl
.
getEmpNum
());
xcglas
.
setTaxmonth
(
date
);
xcglas
.
setChildrenedu
(
Double
.
valueOf
(
spec
.
getZljy
()));
//子女教育
xcglas
.
setHouseloans
(
Double
.
valueOf
(
spec
.
getZfdk
()));
//住房贷款利息
xcglas
.
setHouserents
(
Double
.
valueOf
(
spec
.
getZfzj
()));
//住房租金
xcglas
.
setSupportolder
(
Double
.
valueOf
(
spec
.
getSylr
()));
//赡养老人
xcglas
.
setContinueedu
(
Double
.
valueOf
(
spec
.
getJxjy
()));
//继续教育
xcglas
.
setChildrenedu
(
spec
.
getZljy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZljy
()));
//子女教育
xcglas
.
setHouseloans
(
spec
.
getZfdk
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfdk
()));
//住房贷款利息
xcglas
.
setHouserents
(
spec
.
getZfzj
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfzj
()));
//住房租金
xcglas
.
setSupportolder
(
spec
.
getSylr
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getSylr
()));
//赡养老人
xcglas
.
setContinueedu
(
spec
.
getJxjy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getJxjy
()));
//继续教育
BigDecimal
num1
=
new
BigDecimal
(
spec
.
getZljy
());
BigDecimal
num2
=
new
BigDecimal
(
spec
.
getZfdk
());
BigDecimal
num1
=
new
BigDecimal
(
spec
.
getZljy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZljy
())
);
BigDecimal
num2
=
new
BigDecimal
(
spec
.
getZfdk
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfdk
())
);
double
result1
=
num1
.
add
(
num2
).
doubleValue
();
BigDecimal
num3
=
new
BigDecimal
(
result1
);
BigDecimal
num4
=
new
BigDecimal
(
spec
.
getZfzj
());
BigDecimal
num4
=
new
BigDecimal
(
spec
.
getZfzj
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfzj
())
);
double
result2
=
num3
.
add
(
num4
).
doubleValue
();
BigDecimal
num5
=
new
BigDecimal
(
result2
);
BigDecimal
num6
=
new
BigDecimal
(
spec
.
getSylr
());
BigDecimal
num6
=
new
BigDecimal
(
spec
.
getSylr
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getSylr
())
);
double
result3
=
num5
.
add
(
num6
).
doubleValue
();
BigDecimal
num7
=
new
BigDecimal
(
result3
);
BigDecimal
num8
=
new
BigDecimal
(
spec
.
getJxjy
());
BigDecimal
num8
=
new
BigDecimal
(
spec
.
getJxjy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getJxjy
())
);
double
result
=
num7
.
add
(
num8
).
doubleValue
();
xcglas
.
setTotalmoney
(
result
);
//累计专项附加扣除
...
...
@@ -3424,25 +3424,25 @@ public class SalaryManagementController {
}
else
{
XcglAssoZxfjkc
fjkc
=
XcglAssoZxfjkc
.
builder
().
build
();
fjkc
.
setId
(
xcg
.
getId
());
fjkc
.
setChildrenedu
(
Double
.
valueOf
(
spec
.
getZljy
()));
//子女教育
fjkc
.
setHouseloans
(
Double
.
valueOf
(
spec
.
getZfdk
()));
//住房贷款利息
fjkc
.
setHouserents
(
Double
.
valueOf
(
spec
.
getZfzj
()));
//住房租金
fjkc
.
setSupportolder
(
Double
.
valueOf
(
spec
.
getSylr
()));
//赡养老人
fjkc
.
setContinueedu
(
Double
.
valueOf
(
spec
.
getJxjy
()));
//继续教育
fjkc
.
setChildrenedu
(
spec
.
getZljy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZljy
()));
//子女教育
fjkc
.
setHouseloans
(
spec
.
getZfdk
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfdk
()));
//住房贷款利息
fjkc
.
setHouserents
(
spec
.
getZfzj
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfzj
()));
//住房租金
fjkc
.
setSupportolder
(
spec
.
getSylr
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getSylr
()));
//赡养老人
fjkc
.
setContinueedu
(
spec
.
getJxjy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getJxjy
()));
//继续教育
BigDecimal
num1
=
new
BigDecimal
(
Double
.
valueOf
(
spec
.
getZljy
()));
BigDecimal
num2
=
new
BigDecimal
(
Double
.
valueOf
(
spec
.
getZfdk
()));
BigDecimal
num1
=
new
BigDecimal
(
spec
.
getZljy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZljy
()));
BigDecimal
num2
=
new
BigDecimal
(
spec
.
getZfdk
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfdk
()));
double
result1
=
num1
.
add
(
num2
).
doubleValue
();
BigDecimal
num3
=
new
BigDecimal
(
result1
);
BigDecimal
num4
=
new
BigDecimal
(
Double
.
valueOf
(
spec
.
getZfzj
()));
BigDecimal
num4
=
new
BigDecimal
(
spec
.
getZfzj
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getZfzj
()));
double
result2
=
num3
.
add
(
num4
).
doubleValue
();
BigDecimal
num5
=
new
BigDecimal
(
result2
);
BigDecimal
num6
=
new
BigDecimal
(
Double
.
valueOf
(
spec
.
getSylr
()));
BigDecimal
num6
=
new
BigDecimal
(
spec
.
getSylr
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getSylr
()));
double
result3
=
num5
.
add
(
num6
).
doubleValue
();
BigDecimal
num7
=
new
BigDecimal
(
result3
);
BigDecimal
num8
=
new
BigDecimal
(
Double
.
valueOf
(
spec
.
getJxjy
()));
BigDecimal
num8
=
new
BigDecimal
(
spec
.
getJxjy
()
==
null
?
0
:
Double
.
valueOf
(
spec
.
getJxjy
()));
double
result
=
num7
.
add
(
num8
).
doubleValue
();
fjkc
.
setTotalmoney
(
Double
.
valueOf
(
result
));
//累计专项附加扣除
...
...
@@ -3453,7 +3453,7 @@ public class SalaryManagementController {
// e.printStackTrace();
failure
++;
map
.
put
(
"name"
,
name
);
map
.
put
(
"msg"
,
StringUtils
.
isBlank
(
e
.
getMessage
())
?
"用户信息错误"
:
e
.
getMessage
());
map
.
put
(
"msg"
,
StringUtils
.
isBlank
(
e
.
getMessage
())
?
"用户信息错误
(例如:电话号码不正确等)
"
:
e
.
getMessage
());
}
finally
{
if
(!
map
.
isEmpty
())
{
reasons
.
add
(
map
);
...
...
This diff is collapsed.
Click to expand it.
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