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
b7afad31
Commit
b7afad31
authored
May 13, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化-fxj
parent
d980b0dd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
60 additions
and
23 deletions
+60
-23
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+60
-23
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
b7afad31
...
...
@@ -737,7 +737,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
}
else
if
(
oldInfo
.
getServerItem
().
contains
(
"社保"
)
&&
newInfo
.
getServerItem
().
contains
(
"社保"
)
&&
null
!=
newInfo
.
getSocialUpdateFlag
()
&&
newInfo
.
getSocialUpdateFlag
()
&&
dispatchInfoPreOldVo
==
null
&&
dispatchInfoPreVo
!=
null
)
{
&&
newInfo
.
getSocialUpdateFlag
())
{
// 是转否
if
(
dispatchInfoPreOldVo
==
null
&&
dispatchInfoPreVo
!=
null
){
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(!
diffTitle
.
contains
(
"社保信息"
)){
diffTitle
+=
"、社保信息"
;
...
...
@@ -750,6 +752,24 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailEmpLog
.
setType
(
CommonConstants
.
FOUR_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
null
,
dispatchInfoPreVo
,
user
,
null
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
}
// 否转是
if
(
dispatchInfoPreOldVo
!=
null
&&
dispatchInfoPreVo
==
null
){
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(!
diffTitle
.
contains
(
"社保信息"
)){
diffTitle
+=
"、社保信息"
;
}
}
else
{
diffTitle
=
"社保信息"
;
}
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
THREE_STRING
);
detailEmpLog
.
setType
(
CommonConstants
.
FOUR_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
dispatchInfoPreOldVo
,
null
,
user
,
null
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
}
}
// 公积金处理逻辑
...
...
@@ -863,8 +883,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
}
else
if
(
oldInfo
.
getServerItem
().
contains
(
"公积金"
)
&&
newInfo
.
getServerItem
().
contains
(
"公积金"
)
&&
null
!=
newInfo
.
getFundUpdateFlag
()
&&
newInfo
.
getFundUpdateFlag
()
&&
dispatchInfoFundPreOldVo
==
null
&&
dispatchInfoFundPreVo
!=
null
)
{
&&
newInfo
.
getFundUpdateFlag
()
)
{
if
(
dispatchInfoFundPreOldVo
==
null
&&
dispatchInfoFundPreVo
!=
null
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(!
diffTitle
.
contains
(
"公积金信息"
)){
diffTitle
+=
"、公积金信息"
;
...
...
@@ -878,6 +898,23 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
this
.
setLogBaseInfo
(
empPreId
,
null
,
dispatchInfoFundPreVo
,
user
,
null
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
}
// 否转是
if
(
dispatchInfoFundPreOldVo
!=
null
&&
dispatchInfoFundPreVo
==
null
){
if
(
Common
.
isNotNull
(
diffTitle
))
{
if
(!
diffTitle
.
contains
(
"公积金信息"
)){
diffTitle
+=
"、公积金信息"
;
}
}
else
{
diffTitle
=
"公积金信息"
;
}
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
THREE_STRING
);
detailEmpLog
.
setType
(
CommonConstants
.
FIVE_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
dispatchInfoFundPreOldVo
,
null
,
user
,
null
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
}
}
// 有修改,则加日志
if
(
Common
.
isNotNull
(
diffTitle
))
{
...
...
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