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
74dc8072
Commit
74dc8072
authored
Jul 03, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_保存审核等
parent
f2ee2f21
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-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 @
74dc8072
...
...
@@ -991,7 +991,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 如果档案项目id都没有,则新增。newFlag是true:
boolean
newFlag
=
true
;
String
empId
=
null
;
String
empProjectId
=
null
;
String
empIdCard
=
null
;
// 1人员档案
TEmployeeInfo
emp
=
null
;
...
...
@@ -1048,10 +1047,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
tEmployeeProjectService
.
updateById
(
project
);
}
else
{
project
=
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
if
(
Common
.
isNotNull
(
project
))
{
empProjectId
=
project
.
getId
();
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
}
else
{
// 新建档案、项目档案,将档案id赋值,给其他附属信息
...
...
@@ -1064,10 +1060,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId
=
emp
.
getId
();
empIdCard
=
emp
.
getEmpIdcard
();
// 2项目档案
project
=
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
if
(
Common
.
isNotNull
(
project
))
{
empProjectId
=
project
.
getId
();
}
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
}
if
(
emp
==
null
)
{
...
...
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