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
a695f814
Commit
a695f814
authored
Nov 28, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资年终奖计算修改
parent
d3b62534
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
a695f814
...
@@ -1468,7 +1468,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1468,7 +1468,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
try
{
try
{
// 薪资核心导入代码
// 薪资核心导入代码
if
(
CommonConstants
.
THREE_STRING
.
equals
(
salaryType
))
{
if
(
CommonConstants
.
THREE_STRING
.
equals
(
salaryType
))
{
return
this
.
doLaborCoreSalary
(
savList
,
saiList
,
dept
,
invoiceTitle
,
salary
,
user
);
return
this
.
doLaborCoreSalary
(
savList
,
saiList
,
dept
,
salary
,
user
);
}
else
{
}
else
{
return
this
.
doRemuCoreSalary
(
savList
,
saiList
,
dept
,
salary
,
user
);
return
this
.
doRemuCoreSalary
(
savList
,
saiList
,
dept
,
salary
,
user
);
}
}
...
...
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