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
47c0e2c5
Commit
47c0e2c5
authored
Aug 19, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
invoiceTitle
parent
d0022ad9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+5
-4
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
47c0e2c5
...
...
@@ -249,14 +249,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
* @Date: 2019/9/26 9:44
* @return: com.yifu.cloud.v1.hrms.api.entity.TSalaryStandard
**/
public
R
<
TSalaryStandard
>
saveNewTSalary
(
TSalaryAccountVo
sav
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
LocalDateTime
nowTim
e
)
{
public
R
<
TSalaryStandard
>
saveNewTSalary
(
TSalaryAccountVo
sav
,
TSettleDomainSelectVo
dept
,
YifuUser
user
,
LocalDateTime
nowTime
,
String
invoiceTitl
e
)
{
TSalaryStandard
s
=
null
;
if
(
sav
!=
null
)
{
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
null
;
}
s
=
new
TSalaryStandard
();
s
.
setInvoiceTitle
(
invoiceTitle
);
s
.
setType
(
CommonConstants
.
ZERO_INT
);
s
.
setBelongDeptId
(
String
.
valueOf
(
user
.
getDeptId
()));
if
(
Common
.
isNotNull
(
user
.
getDeptName
()))
{
...
...
@@ -1457,9 +1458,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
TSalaryStandard
salary
;
LocalDateTime
nowTime
=
LocalDateTime
.
now
();
//工资主表
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
salaryAccountVo
,
dept
,
user
,
nowTime
);
String
invoiceTitle
=
dept
.
getBusinessSubjectName
();
R
<
TSalaryStandard
>
sr
=
this
.
saveNewTSalary
(
salaryAccountVo
,
dept
,
user
,
nowTime
,
invoiceTitle
);
if
(
sr
==
null
||
sr
.
getCode
()
==
CommonConstants
.
FAIL
)
{
return
sr
;
}
else
{
...
...
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