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
85c87897
Commit
85c87897
authored
Jul 08, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
7010358e
07295d0d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+5
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
85c87897
...
@@ -996,7 +996,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -996,7 +996,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 预入职-员工学历信息表
// 预入职-员工学历信息表
TPreEmpEducation
tPreEmpEducation
=
vo
.
getTpreEmpEducation
();
TPreEmpEducation
tPreEmpEducation
=
vo
.
getTpreEmpEducation
();
// 如果档案项目id都没有,则新增。newFlag是true:
// 如果档案项目id都没有,则新增。newFlag是true:
boolean
newFlag
=
true
;
String
empId
=
null
;
String
empId
=
null
;
String
empIdCard
=
null
;
String
empIdCard
=
null
;
// 1人员档案
// 1人员档案
...
@@ -1029,7 +1028,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1029,7 +1028,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
if
(
tPreEmployeeInfo
!=
null
&&
Common
.
isNotNull
(
tPreEmployeeInfo
.
getOldId
())
if
(
tPreEmployeeInfo
!=
null
&&
Common
.
isNotNull
(
tPreEmployeeInfo
.
getOldId
())
&&
Common
.
isNotNull
(
tPreEmployeeProject
.
getOldId
()))
{
&&
Common
.
isNotNull
(
tPreEmployeeProject
.
getOldId
()))
{
newFlag
=
false
;
empId
=
tPreEmployeeInfo
.
getOldId
();
empId
=
tPreEmployeeInfo
.
getOldId
();
emp
=
tEmployeeInfoService
.
getById
(
empId
);
emp
=
tEmployeeInfoService
.
getById
(
empId
);
if
(
emp
!=
null
)
{
if
(
emp
!=
null
)
{
...
@@ -1128,9 +1126,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1128,9 +1126,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TAttaInfo
>
attaList
=
tPreEmpEducation
.
getAttaList
();
List
<
TAttaInfo
>
attaList
=
tPreEmpEducation
.
getAttaList
();
if
(
attaList
!=
null
)
{
if
(
attaList
!=
null
)
{
String
attaId
=
tPreEmpEducation
.
getOldId
();
String
attaId
=
tPreEmpEducation
.
getOldId
();
if
(!
newFlag
)
{
tAttaInfoService
.
deleteByDomainId
(
attaId
);
tAttaInfoService
.
deleteByDomainId
(
attaId
);
}
TAttaInfo
newEmpAtta
;
TAttaInfo
newEmpAtta
;
for
(
TAttaInfo
atta
:
attaList
)
{
for
(
TAttaInfo
atta
:
attaList
)
{
newEmpAtta
=
new
TAttaInfo
();
newEmpAtta
=
new
TAttaInfo
();
...
@@ -1269,9 +1265,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1269,9 +1265,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TAttaInfo
>
attaList
=
preInfo
.
getAttaList
();
List
<
TAttaInfo
>
attaList
=
preInfo
.
getAttaList
();
if
(
attaList
!=
null
)
{
if
(
attaList
!=
null
)
{
String
attaId
=
preInfo
.
getOldId
();
String
attaId
=
preInfo
.
getOldId
();
if
(!
newFlag
)
{
tAttaInfoService
.
deleteByDomainId
(
attaId
);
tAttaInfoService
.
deleteByDomainId
(
attaId
);
}
TAttaInfo
newEmpAtta
;
TAttaInfo
newEmpAtta
;
for
(
TAttaInfo
atta
:
attaList
)
{
for
(
TAttaInfo
atta
:
attaList
)
{
newEmpAtta
=
new
TAttaInfo
();
newEmpAtta
=
new
TAttaInfo
();
...
@@ -1831,9 +1825,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1831,9 +1825,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
voR
!=
null
&&
voR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
if
(
voR
!=
null
&&
voR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
// 转到更新档案去
// 转到更新档案去
vo
=
voR
.
getData
();
vo
=
voR
.
getData
();
updateToEmployeeByPre
(
vo
);
this
.
updateById
(
preEmpMain
);
this
.
updateById
(
preEmpMain
);
tPreEmpMainLogService
.
save
(
auditLog
);
tPreEmpMainLogService
.
save
(
auditLog
);
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
status
))
{
updateToEmployeeByPre
(
vo
);
}
}
}
}
}
}
}
...
...
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