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
1ac0b8d3
You need to sign in or sign up before continuing.
Commit
1ac0b8d3
authored
Apr 09, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.21-优化
parent
526f6fdb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+11
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
1ac0b8d3
...
...
@@ -566,7 +566,7 @@ public class SalaryAccountUtil implements Serializable {
if
(!
this
.
setNewEmpBase
(
newEmps
,
newEmps
.
getLineNums
()
+
dataRow
,
errorList
,
notLabour
,
entity
,
salaryType
,
dept
,
user
,
entity
.
getSalaryStyle
()
,
CommonConstants
.
ZERO_STRING
.
equals
(
entity
.
getSalaryGiveTime
()),
invoiceTitle
,
entity
.
getSaiList
(),
bankMap
))
{
,
entity
.
getSaiList
(),
bankMap
,
costReductionMap
,
tSalaryAccountService
))
{
isContinue
=
false
;
continue
;
}
...
...
@@ -1156,7 +1156,8 @@ public class SalaryAccountUtil implements Serializable {
private
boolean
setNewEmpBase
(
TSalaryEmployee
newEmp
,
int
i
,
List
<
ErrorMessage
>
errorList
,
boolean
notLabour
,
TSalaryAccountVo
entity
,
String
salaryType
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
String
salaryStyle
,
boolean
salaryGiveTimeFlag
,
String
invoiceTitle
,
List
<
TSalaryAccountItemVo
>
saiList
,
Map
<
String
,
String
>
bankMap
)
{
,
boolean
salaryGiveTimeFlag
,
String
invoiceTitle
,
List
<
TSalaryAccountItemVo
>
saiList
,
Map
<
String
,
String
>
bankMap
,
Map
<
String
,
BigDecimal
>
costReductionMap
,
TSalaryAccountService
tSalaryAccountService
)
{
String
newEmpStr
=
"新员工"
;
if
(!
notLabour
)
{
newEmpStr
=
"劳务费"
;
...
...
@@ -1208,7 +1209,14 @@ public class SalaryAccountUtil implements Serializable {
TSalaryAccountItemVo
sai
=
new
TSalaryAccountItemVo
();
sai
.
setCnName
(
SalaryConstants
.
COST_REDUCTION
);
sai
.
setJavaFiedName
(
SalaryConstants
.
COST_REDUCTION_JAVA
);
sai
.
setSalaryMoney
(
DateUtil
.
getTaxMonthMoney
(
entity
.
getTaxMonth
()));
BigDecimal
costReduction
=
costReductionMap
.
get
(
entity
.
getEmpIdcard
());
if
(
costReduction
==
null
)
{
costReduction
=
tSalaryAccountService
.
getCostReductionToCard
(
entity
.
getEmpIdcard
(),
invoiceTitle
);
}
if
(
costReduction
==
null
)
{
costReduction
=
SalaryConstants
.
COST_MONEY
;
}
sai
.
setSalaryMoney
(
costReduction
);
sai
.
setIsTax
(
CommonConstants
.
ZERO_INT
);
saiList
.
add
(
sai
);
newEmp
.
setTaxMonth
(
entity
.
getTaxMonth
());
...
...
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