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
41230b92
Commit
41230b92
authored
Feb 20, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.1-优化薪资导入2
parent
523ffe01
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+9
-2
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
41230b92
...
@@ -469,7 +469,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -469,7 +469,8 @@ public class SalaryAccountUtil implements Serializable {
if
(
CommonConstants
.
ONE_STRING
.
equals
(
entity
.
getIsNewEmployee
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
entity
.
getIsNewEmployee
()))
{
if
(!
this
.
setNewEmpBase
(
newEmps
,
newEmps
.
getLineNums
(),
errorList
,
notLabour
if
(!
this
.
setNewEmpBase
(
newEmps
,
newEmps
.
getLineNums
(),
errorList
,
notLabour
,
entity
,
salaryType
,
dept
,
user
,
entity
.
getSalaryStyle
()
,
entity
,
salaryType
,
dept
,
user
,
entity
.
getSalaryStyle
()
,
CommonConstants
.
ZERO_STRING
.
equals
(
entity
.
getSalaryGiveTime
()),
invoiceTitle
))
{
,
CommonConstants
.
ZERO_STRING
.
equals
(
entity
.
getSalaryGiveTime
()),
invoiceTitle
,
entity
.
getSaiList
()))
{
continue
;
continue
;
}
}
saveNewEmpList
.
add
(
newEmps
);
saveNewEmpList
.
add
(
newEmps
);
...
@@ -845,7 +846,7 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -845,7 +846,7 @@ public class SalaryAccountUtil implements Serializable {
private
boolean
setNewEmpBase
(
TSalaryEmployee
newEmp
,
int
i
,
List
<
ErrorMessage
>
errorList
,
boolean
notLabour
private
boolean
setNewEmpBase
(
TSalaryEmployee
newEmp
,
int
i
,
List
<
ErrorMessage
>
errorList
,
boolean
notLabour
,
TSalaryAccountVo
entity
,
String
salaryType
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
String
salaryStyle
,
TSalaryAccountVo
entity
,
String
salaryType
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
String
salaryStyle
,
boolean
salaryGiveTimeFlag
,
String
invoiceTitle
)
{
,
boolean
salaryGiveTimeFlag
,
String
invoiceTitle
,
List
<
TSalaryAccountItemVo
>
saiList
)
{
String
newEmpStr
=
"新员工"
;
String
newEmpStr
=
"新员工"
;
if
(!
notLabour
)
{
if
(!
notLabour
)
{
newEmpStr
=
"劳务费"
;
newEmpStr
=
"劳务费"
;
...
@@ -894,6 +895,12 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -894,6 +895,12 @@ public class SalaryAccountUtil implements Serializable {
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
return
false
;
return
false
;
}
else
{
}
else
{
TSalaryAccountItemVo
sai
=
new
TSalaryAccountItemVo
();
sai
.
setCnName
(
SalaryConstants
.
COST_REDUCTION
);
sai
.
setJavaFiedName
(
SalaryConstants
.
COST_REDUCTION_JAVA
);
sai
.
setSalaryMoney
(
DateUtil
.
getTaxMonthMoney
(
entity
.
getTaxMonth
()));
sai
.
setIsTax
(
CommonConstants
.
ZERO_INT
);
saiList
.
add
(
sai
);
newEmp
.
setTaxMonth
(
entity
.
getTaxMonth
());
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