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
6b7927bb
Commit
6b7927bb
authored
Apr 09, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
b8714678
cd7efe6f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
10 deletions
+23
-10
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+23
-10
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
6b7927bb
...
...
@@ -162,11 +162,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
}
List
<
TEmployeeInsurancePre
>
saveOrUpdateList
=
new
ArrayList
<>();
if
(
newList
!=
null
&&
!
newList
.
isEmpty
())
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、商险信息"
;
}
else
{
diffTitle
=
"商险信息"
;
}
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
...
...
@@ -175,11 +172,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if
(
Common
.
isNotNull
(
newInsurance
.
getModelType
()))
{
// 1:新增
if
(
CommonConstants
.
ONE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
saveOrUpdateList
.
add
(
newInsurance
);
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
newInsurance
.
getModelType
());
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
null
,
newInsurance
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
...
...
@@ -191,11 +190,14 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
}
else
{
saveOrUpdateList
.
add
(
newInsurance
);
}
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
oldInsurance
,
newInsurance
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
detailList
.
add
(
detailInsuranceLog
);
if
(
Common
.
isNotNull
(
differenceInsuranceKey
)
||
oldInsurance
==
null
)
{
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
oldInsurance
,
newInsurance
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
}
else
{
saveOrUpdateList
.
add
(
newInsurance
);
// 2:修改无老ID
...
...
@@ -203,6 +205,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailInsuranceLog
.
setModelType
(
CommonConstants
.
ONE_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
null
,
newInsurance
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
...
...
@@ -211,13 +214,23 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailInsuranceLog
.
setModelType
(
newInsurance
.
getModelType
());
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setLogBaseInfo
(
empPreId
,
newInsurance
,
null
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
}
else
{
// 没有调整的
isModifyInsurance
=
true
;
saveOrUpdateList
.
add
(
newInsurance
);
}
}
// 如果变更了
if
(
isModifyInsurance
)
{
if
(
Common
.
isNotNull
(
diffTitle
))
{
diffTitle
+=
"、商险信息"
;
}
else
{
diffTitle
=
"商险信息"
;
}
}
}
// 有修改,则加日志
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