Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
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
AutogeneralShanghai
yd-backend
Commits
c9b136ac
Commit
c9b136ac
authored
Jan 04, 2022
by
hongzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资单手工录入的数据,C005特殊处理下
parent
6905fc44
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletions
+18
-1
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
+18
-1
No files found.
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
View file @
c9b136ac
...
...
@@ -991,14 +991,22 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
agAclSalary
.
setPractitionerId
(
practitionerId
);
agAclSalary
.
setYearMonth
(
payoutYearmonth
);
List
<
AgAclSalary
>
newSalaryList
=
agAclSalaryMapper
.
queryByRecord
(
agAclSalary
);
List
<
AgAclSalary
>
alaryList
=
new
ArrayList
<>();
BigDecimal
abc
=
BigDecimal
.
ZERO
;
BigDecimal
d
=
BigDecimal
.
ZERO
;
BigDecimal
c05
=
BigDecimal
.
ZERO
;
for
(
AgAclSalary
item
:
newSalaryList
)
{
if
(
null
!=
item
.
getAmount
())
{
abc
=
abc
.
add
(
item
.
getAmount
());
}
if
(
"C-005"
.
equals
(
item
.
getSalaryCode
())){
c05
=
c05
.
add
(
item
.
getAmount
());
}
else
{
alaryList
.
add
(
item
);
}
}
responseVO
.
setAbc
(
abc
.
toString
());
// 202109开始的手工录入薪资单的保单明细pdf
String
pdfOssPath
=
null
;
...
...
@@ -1017,7 +1025,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
BigDecimal
abc_d
=
abc
.
subtract
(
d
);
// list
List
<
SalaryDetail
>
list
=
new
ArrayList
<>();
for
(
AgAclSalary
item
:
newSalaryList
)
{
//C05特殊处理
if
(
c05
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
AgAclSalary
item
=
new
AgAclSalary
();
item
.
setAmount
(
c05
);
item
.
setSalaryType
(
"C"
);
item
.
setSalaryCode
(
"C-005"
);
item
.
setSalaryName
(
"银盾在线佣金"
);
alaryList
.
add
(
item
);
}
for
(
AgAclSalary
item
:
alaryList
)
{
SalaryDetail
target
=
new
SalaryDetail
();
target
.
setSalaryName
(
item
.
getSalaryName
());
target
.
setCommission
(
item
.
getAmount
().
doubleValue
());
...
...
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