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
8a745de2
Commit
8a745de2
authored
Jul 12, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_isEmpty
parent
2a0d0db7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
12 deletions
+9
-12
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+9
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
8a745de2
...
@@ -1146,9 +1146,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1146,9 +1146,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isEmpty
(
tEmpEducation
.
getEmpCode
()))
{
if
(
Common
.
isEmpty
(
tEmpEducation
.
getEmpCode
()))
{
tEmpEducation
.
setEmpCode
(
emp
.
getEmpCode
());
tEmpEducation
.
setEmpCode
(
emp
.
getEmpCode
());
}
}
if
(
Common
.
isEmpty
(
tEmpEducation
.
getCreateBy
()))
{
tEmpEducation
.
setCreateBy
(
user
.
getId
());
}
if
(
Common
.
isEmpty
(
tEmpEducation
.
getCreateTime
()))
{
if
(
Common
.
isEmpty
(
tEmpEducation
.
getCreateTime
()))
{
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
}
}
...
@@ -1157,7 +1154,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1157,7 +1154,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
empIdCard
))
{
if
(
Common
.
isNotNull
(
empIdCard
))
{
tEmpEducationService
.
updateEducationToNoByIdCard
(
empIdCard
);
tEmpEducationService
.
updateEducationToNoByIdCard
(
empIdCard
);
}
}
if
(
Common
.
is
NotNull
(
tEmpEducation
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpEducation
.
getCreateBy
()))
{
tEmpEducation
.
setCreateBy
(
user
.
getId
());
tEmpEducation
.
setCreateBy
(
user
.
getId
());
tEmpEducation
.
setCreateName
(
user
.
getNickname
());
tEmpEducation
.
setCreateName
(
user
.
getNickname
());
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1176,7 +1173,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1176,7 +1173,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil
.
copyProperties
(
atta
,
newEmpAtta
,
ID
);
BeanUtil
.
copyProperties
(
atta
,
newEmpAtta
,
ID
);
newEmpAtta
.
setDomainId
(
tEmpEducation
.
getId
());
newEmpAtta
.
setDomainId
(
tEmpEducation
.
getId
());
if
(
Common
.
is
NotNull
(
tEmpEducation
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpEducation
.
getCreateBy
()))
{
tEmpEducation
.
setCreateBy
(
user
.
getId
());
tEmpEducation
.
setCreateBy
(
user
.
getId
());
tEmpEducation
.
setCreateName
(
user
.
getNickname
());
tEmpEducation
.
setCreateName
(
user
.
getNickname
());
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1199,7 +1196,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1199,7 +1196,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil
.
copyProperties
(
tPreEmpBadRecord
,
tEmpBadRecord
,
ID
);
BeanUtil
.
copyProperties
(
tPreEmpBadRecord
,
tEmpBadRecord
,
ID
);
tEmpBadRecord
.
setEmpId
(
empId
);
tEmpBadRecord
.
setEmpId
(
empId
);
if
(
Common
.
is
NotNull
(
tEmpBadRecord
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpBadRecord
.
getCreateBy
()))
{
tEmpBadRecord
.
setCreateBy
(
user
.
getId
());
tEmpBadRecord
.
setCreateBy
(
user
.
getId
());
tEmpBadRecord
.
setCreateName
(
user
.
getNickname
());
tEmpBadRecord
.
setCreateName
(
user
.
getNickname
());
tEmpBadRecord
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpBadRecord
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1219,7 +1216,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1219,7 +1216,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil
.
copyProperties
(
tPreEmpContactInfo
,
tEmpContactInfo
,
ID
);
BeanUtil
.
copyProperties
(
tPreEmpContactInfo
,
tEmpContactInfo
,
ID
);
tEmpContactInfo
.
setEmpId
(
empId
);
tEmpContactInfo
.
setEmpId
(
empId
);
if
(
Common
.
is
NotNull
(
tEmpContactInfo
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpContactInfo
.
getCreateBy
()))
{
tEmpContactInfo
.
setCreateBy
(
user
.
getId
());
tEmpContactInfo
.
setCreateBy
(
user
.
getId
());
tEmpContactInfo
.
setCreateName
(
user
.
getNickname
());
tEmpContactInfo
.
setCreateName
(
user
.
getNickname
());
tEmpContactInfo
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpContactInfo
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1246,7 +1243,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1246,7 +1243,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpDisabilityInfo
.
setEmpCode
(
emp
.
getEmpCode
());
tEmpDisabilityInfo
.
setEmpCode
(
emp
.
getEmpCode
());
}
}
if
(
Common
.
is
NotNull
(
tEmpDisabilityInfo
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpDisabilityInfo
.
getCreateBy
()))
{
tEmpDisabilityInfo
.
setCreateBy
(
user
.
getId
());
tEmpDisabilityInfo
.
setCreateBy
(
user
.
getId
());
tEmpDisabilityInfo
.
setCreateName
(
user
.
getNickname
());
tEmpDisabilityInfo
.
setCreateName
(
user
.
getNickname
());
tEmpDisabilityInfo
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpDisabilityInfo
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1272,7 +1269,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1272,7 +1269,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpFamily
.
setId
(
tPreEmpFamily
.
getOldId
());
tEmpFamily
.
setId
(
tPreEmpFamily
.
getOldId
());
}
}
if
(
Common
.
is
NotNull
(
tEmpFamily
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
tEmpFamily
.
getCreateBy
()))
{
tEmpFamily
.
setCreateBy
(
user
.
getId
());
tEmpFamily
.
setCreateBy
(
user
.
getId
());
tEmpFamily
.
setCreateName
(
user
.
getNickname
());
tEmpFamily
.
setCreateName
(
user
.
getNickname
());
tEmpFamily
.
setCreateTime
(
LocalDateTime
.
now
());
tEmpFamily
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1299,7 +1296,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1299,7 +1296,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
info
.
setId
(
preInfo
.
getOldId
());
info
.
setId
(
preInfo
.
getOldId
());
}
}
if
(
Common
.
is
NotNull
(
info
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
info
.
getCreateBy
()))
{
info
.
setCreateBy
(
user
.
getId
());
info
.
setCreateBy
(
user
.
getId
());
info
.
setCreateName
(
user
.
getNickname
());
info
.
setCreateName
(
user
.
getNickname
());
info
.
setCreateTime
(
LocalDateTime
.
now
());
info
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1316,7 +1313,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1316,7 +1313,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
BeanUtil
.
copyProperties
(
atta
,
newEmpAtta
,
ID
);
BeanUtil
.
copyProperties
(
atta
,
newEmpAtta
,
ID
);
newEmpAtta
.
setDomainId
(
info
.
getId
());
newEmpAtta
.
setDomainId
(
info
.
getId
());
if
(
Common
.
is
NotNull
(
atta
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
atta
.
getCreateBy
()))
{
atta
.
setCreateBy
(
user
.
getId
());
atta
.
setCreateBy
(
user
.
getId
());
atta
.
setCreateName
(
user
.
getNickname
());
atta
.
setCreateName
(
user
.
getNickname
());
atta
.
setCreateTime
(
LocalDateTime
.
now
());
atta
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -1342,7 +1339,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1342,7 +1339,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
info
.
setEmpName
(
emp
.
getEmpName
());
info
.
setEmpName
(
emp
.
getEmpName
());
info
.
setEmpIdcard
(
emp
.
getEmpIdcard
());
info
.
setEmpIdcard
(
emp
.
getEmpIdcard
());
if
(
Common
.
is
NotNull
(
info
.
getCreateBy
()))
{
if
(
Common
.
is
Empty
(
info
.
getCreateBy
()))
{
info
.
setCreateBy
(
user
.
getId
());
info
.
setCreateBy
(
user
.
getId
());
info
.
setCreateName
(
user
.
getNickname
());
info
.
setCreateName
(
user
.
getNickname
());
info
.
setCreateTime
(
LocalDateTime
.
now
());
info
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
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