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
15cf9df9
Commit
15cf9df9
authored
Mar 06, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.7-项目
parent
2f48885b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
42 deletions
+44
-42
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+42
-40
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
15cf9df9
...
...
@@ -2094,6 +2094,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
**/
@Override
public
void
doSaveBelongDept
(
TEmployeeProject
p
,
String
feedbackType
)
{
if
(
p
!=
null
)
{
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
=
new
TEmployeeProjectBelongDeptSearchCspVo
();
searchCspVo
.
setDeptId
(
p
.
getDeptId
());
searchCspVo
.
setEmpIdCard
(
p
.
getEmpIdcard
());
...
...
@@ -2138,5 +2139,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
15cf9df9
...
...
@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmployeeProjectService
.
updateById
(
project
);
}
else
{
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
project
=
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
}
}
else
{
// 新建档案、项目档案,将档案id赋值,给其他附属信息
...
...
@@ -1835,7 +1835,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId
=
emp
.
getId
();
empIdCard
=
emp
.
getEmpIdcard
();
// 2项目档案
this
.
saveTEmployeeProject
(
project
,
user
,
tPreEmployeeProject
,
emp
,
dept
);
project
=
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