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
8251d9da
You need to sign in or sign up before continuing.
Commit
8251d9da
authored
Jan 13, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职确认信息编辑提交
parent
91ef8067
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
53 additions
and
25 deletions
+53
-25
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+53
-25
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
8251d9da
...
@@ -453,6 +453,34 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -453,6 +453,34 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
eq
(
TEmployeeContractPre:
:
getId
,
contractOld
.
getId
()));
.
eq
(
TEmployeeContractPre:
:
getId
,
contractOld
.
getId
()));
}
}
//是的场景删除合同待购买数据
if
(
newInfo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
contractOld
)
&&
Common
.
isEmpty
(
employeeContractPre
)
&&
null
!=
newInfo
.
getContractUpdateFlag
()
&&
newInfo
.
getContractUpdateFlag
())
{
//记录操作记录
contractOld
.
setAttaList
(
null
);
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
THREE_STRING
);
detailEmpLog
.
setType
(
CommonConstants
.
THREE_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
contractOld
,
null
,
user
,
differenceContractKey
,
logId
,
detailEmpLog
);
detailList
.
add
(
detailEmpLog
);
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、合同信息"
;
}
else
{
diffTitle
=
"合同信息"
;
}
// 创建更新条件构造器
LambdaUpdateWrapper
<
TAttaInfo
>
updateWrapperContract
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapperContract
.
eq
(
TAttaInfo:
:
getDomainId
,
contractOld
.
getId
())
.
set
(
TAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的关联ID
attaInfoService
.
update
(
updateWrapperContract
);
//删除历史的合同待签订数据
contractPreService
.
remove
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
eq
(
TEmployeeContractPre:
:
getId
,
contractOld
.
getId
()));
}
if
(
newInfo
.
getServerItem
().
contains
(
"合同"
)
&&
contractOld
!=
null
&&
employeeContractPre
!=
null
if
(
newInfo
.
getServerItem
().
contains
(
"合同"
)
&&
contractOld
!=
null
&&
employeeContractPre
!=
null
&&
null
!=
newInfo
.
getContractUpdateFlag
()
&&
newInfo
.
getContractUpdateFlag
())
{
&&
null
!=
newInfo
.
getContractUpdateFlag
()
&&
newInfo
.
getContractUpdateFlag
())
{
//1.9.11 huych 附件类型不比较差异
//1.9.11 huych 附件类型不比较差异
...
@@ -752,6 +780,30 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -752,6 +780,30 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
.
toInstant
());
.
toInstant
());
}
}
}
}
/**
* @Description: 填充基本信息
* @Author: hgw
* @Date: 2025/4/8 10:49
* @return: void
**/
private
void
setLogBaseInfo
(
String
empPreId
,
Object
oldInfo
,
Object
newInfo
,
YifuUser
user
,
String
differenceKey
,
String
logId
,
TEmployeePreLogDetail
detailEmpLog
)
{
detailEmpLog
.
setPreId
(
empPreId
);
detailEmpLog
.
setPreLogId
(
logId
);
detailEmpLog
.
setDifferenceInfo
(
differenceKey
);
detailEmpLog
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
Common
.
isNotNull
(
user
))
{
detailEmpLog
.
setCreateBy
(
user
.
getId
());
detailEmpLog
.
setCreateName
(
user
.
getNickname
());
}
if
(
Common
.
isNotNull
(
oldInfo
))
{
detailEmpLog
.
setOldInfo
(
JSON
.
toJSONString
(
oldInfo
,
features
));
}
if
(
Common
.
isNotNull
(
newInfo
))
{
detailEmpLog
.
setNewInfo
(
JSON
.
toJSONString
(
newInfo
,
features
));
}
}
@Override
@Override
public
void
saveUpdateInsurance
(
String
empPreId
,
EmployeeRegistrationPre
oldInfo
public
void
saveUpdateInsurance
(
String
empPreId
,
EmployeeRegistrationPre
oldInfo
,
EmployeeRegistrationPre
newInfo
,
String
userId
,
String
nickName
,
Map
<
String
,
TEmployeeInsurancePre
>
oldMap
,
EmployeeRegistrationPre
newInfo
,
String
userId
,
String
nickName
,
Map
<
String
,
TEmployeeInsurancePre
>
oldMap
...
@@ -886,7 +938,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -886,7 +938,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
attaInfoService
.
update
(
updateWrapperContract
);
attaInfoService
.
update
(
updateWrapperContract
);
//删除历史的合同待签订数据
//删除历史的合同待签订数据
contractPreService
.
remove
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
contractPreService
.
remove
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"10"
,
"11"
))
.
eq
(
TEmployeeContractPre:
:
getId
,
contractOld
.
getId
()));
.
eq
(
TEmployeeContractPre:
:
getId
,
contractOld
.
getId
()));
}
}
...
@@ -1036,30 +1088,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -1036,30 +1088,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
}
}
}
}
/**
* @Description: 填充基本信息
* @Author: hgw
* @Date: 2025/4/8 10:49
* @return: void
**/
private
void
setLogBaseInfo
(
String
empPreId
,
Object
oldInfo
,
Object
newInfo
,
YifuUser
user
,
String
differenceKey
,
String
logId
,
TEmployeePreLogDetail
detailEmpLog
)
{
detailEmpLog
.
setPreId
(
empPreId
);
detailEmpLog
.
setPreLogId
(
logId
);
detailEmpLog
.
setDifferenceInfo
(
differenceKey
);
detailEmpLog
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
Common
.
isNotNull
(
user
))
{
detailEmpLog
.
setCreateBy
(
user
.
getId
());
detailEmpLog
.
setCreateName
(
user
.
getNickname
());
}
if
(
Common
.
isNotNull
(
oldInfo
))
{
detailEmpLog
.
setOldInfo
(
JSON
.
toJSONString
(
oldInfo
,
features
));
}
if
(
Common
.
isNotNull
(
newInfo
))
{
detailEmpLog
.
setNewInfo
(
JSON
.
toJSONString
(
newInfo
,
features
));
}
}
/**
/**
* @Description: 填充基本信息
* @Description: 填充基本信息
* @Author: huyc
* @Author: huyc
...
...
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