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
0c66d60f
Commit
0c66d60f
authored
Jul 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-薪资导入相关
parent
3a4bf6a4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+3
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
0c66d60f
...
...
@@ -992,7 +992,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
one
.
setEmpName
(
vo
.
getEmpName
());
one
.
setBankName
(
vo
.
getBankName
());
baseMapper
.
updateById
(
one
);
logService
.
initModLog
(
o
ld
,
one
,
CommonConstants
.
TWO_STRING
,
"ekp"
,
null
);
logService
.
initModLog
(
o
ne
,
old
,
CommonConstants
.
TWO_STRING
,
"ekp"
,
null
);
}
return
R
.
ok
();
}
...
...
@@ -1027,7 +1027,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if
(
pre
!=
null
)
return
R
.
failed
(
pre
);
// 变更日志 fxj 2023-10-24
logService
.
initModLog
(
old
,
tSalaryEmployee
,
CommonConstants
.
ZERO_STRING
,
user
.
getNickname
(),
null
);
logService
.
initModLog
(
tSalaryEmployee
,
old
,
CommonConstants
.
ZERO_STRING
,
user
.
getNickname
(),
null
);
int
res
=
baseMapper
.
updateById
(
tSalaryEmployee
);
if
(
res
>=
CommonConstants
.
ZERO_INT
){
return
R
.
ok
();
...
...
@@ -1115,7 +1115,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
newEmp
.
setTaxMonth
(
employee
.
getTaxMonth
());
}
// 变更日志 hgw 2024-7-16 18:19:57
logService
.
initModLog
(
employee
,
newEmp
,
CommonConstants
.
THREE_STRING
,
newEmp
.
getCreateName
(),
null
);
logService
.
initModLog
(
newEmp
,
employee
,
CommonConstants
.
THREE_STRING
,
newEmp
.
getCreateName
(),
null
);
BeanUtil
.
copyProperties
(
newEmp
,
employee
,
ignoreProperties
);
this
.
updateById
(
employee
);
}
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