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
89c12049
Commit
89c12049
authored
May 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日志优化-fxj
parent
3ac376eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+6
-6
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
89c12049
...
...
@@ -952,7 +952,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
);
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
,
preVo
.
getEmployeeContractPreVos
()
);
}
catch
(
Exception
e
)
{
log
.
error
(
"自动化办理执行异常"
,
e
);
}
...
...
@@ -1666,7 +1666,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
TEmployeeContractPreVo
employeeContractPreVo
=
new
TEmployeeContractPreVo
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
()))
{
preVo
.
setContractIsBuy
(
employeeContractPreVo
.
getContractFlag
());
preVo
.
setContractIsBuy
(
preVo
.
getEmployeeContractPreVos
()
.
getContractFlag
());
BeanUtils
.
copyProperties
(
preVo
.
getEmployeeContractPreVos
(),
employeeContractPreVo
);
//生成合同待购买数据
String
errorStr
=
null
;
...
...
@@ -1743,7 +1743,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
socialDaprUtils
.
saveFundPreInfo
(
preVo
);
}
//确认接收时增加 档案、商险、合同、社保、公积金的变更日志 (具体产生哪些日志按服务事项(serverItem)来生成),参考 tEmployeePreLogService.saveModifyAndUpdateInsurance的实现,只处理日志
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
);
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
,
employeeContractPreVo
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
...
...
@@ -2008,7 +2008,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//保存确认接收日志(合同、商险、社保、公积金新增日志)
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
);
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
,
employeeContractPreVo
);
}
}
}
catch
(
Exception
e
)
{
...
...
@@ -3247,7 +3247,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
* @param preVo 入职确认信息VO
* @param user 当前用户
**/
private
void
saveConfirmReceiveLog
(
String
empPreId
,
EmployeeRegistrationPreVo
preVo
,
YifuUser
user
)
{
private
void
saveConfirmReceiveLog
(
String
empPreId
,
EmployeeRegistrationPreVo
preVo
,
YifuUser
user
,
TEmployeeContractPreVo
employeeContractPreVo
)
{
try
{
if
(
Common
.
isEmpty
(
empPreId
)
||
Common
.
isEmpty
(
preVo
))
{
return
;
...
...
@@ -3352,7 +3352,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
contractDetail
.
setPreId
(
empPreId
);
contractDetail
.
setPreLogId
(
logId
);
contractDetail
.
setOldInfo
(
null
);
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
preVo
.
getEmployeeContractPreVos
()
,
JSON_FEATURES
));
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
employeeContractPreVo
,
JSON_FEATURES
));
contractDetail
.
setDifferenceInfo
(
null
);
contractDetail
.
setCreateBy
(
user
.
getId
());
contractDetail
.
setCreateName
(
user
.
getNickname
());
...
...
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