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
1c43017f
Commit
1c43017f
authored
Feb 01, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
72101c33
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+2
-2
DoJointTask.java
...m/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
+4
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
1c43017f
...
@@ -646,6 +646,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -646,6 +646,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(!
errorMessageList
.
isEmpty
())
{
if
(!
errorMessageList
.
isEmpty
())
{
return
R
.
failed
(
errorMessageList
);
return
R
.
failed
(
errorMessageList
);
}
else
{
}
else
{
YifuUser
user
=
SecurityUtils
.
getUser
();
//更新项目档案
//更新项目档案
if
(!
updProjectList
.
isEmpty
())
{
if
(!
updProjectList
.
isEmpty
())
{
baseMapper
.
updateReduceEmpProject
(
updProjectList
);
baseMapper
.
updateReduceEmpProject
(
updProjectList
);
...
@@ -653,12 +654,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -653,12 +654,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//更新人员档案
//更新人员档案
if
(!
updList
.
isEmpty
())
{
if
(!
updList
.
isEmpty
())
{
List
<
TEmployeeInfo
>
updEmpInfoList
=
updList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
List
<
TEmployeeInfo
>
updEmpInfoList
=
updList
.
stream
().
distinct
().
collect
(
Collectors
.
toList
());
YifuUser
user
=
SecurityUtils
.
getUser
();
doJointTask
.
doUpdateEmployeeInfo
(
updEmpInfoList
,
user
);
doJointTask
.
doUpdateEmployeeInfo
(
updEmpInfoList
,
user
);
}
}
// 记录变更日志
// 记录变更日志
if
(!
updateProjectList
.
isEmpty
())
{
if
(!
updateProjectList
.
isEmpty
())
{
doJointTask
.
saveModificationRecord
(
updateProjectList
);
doJointTask
.
saveModificationRecord
(
updateProjectList
,
user
);
}
}
}
}
return
R
.
ok
();
return
R
.
ok
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
View file @
1c43017f
...
@@ -132,12 +132,12 @@ public class DoJointTask {
...
@@ -132,12 +132,12 @@ public class DoJointTask {
* @return: void
* @return: void
**/
**/
@Async
@Async
public
void
saveModificationRecord
(
List
<
EmployeeProjectNewOldVO
>
updateProjectList
)
{
public
void
saveModificationRecord
(
List
<
EmployeeProjectNewOldVO
>
updateProjectList
,
YifuUser
user
)
{
try
{
try
{
for
(
EmployeeProjectNewOldVO
newOldVO
:
updateProjectList
)
{
for
(
EmployeeProjectNewOldVO
newOldVO
:
updateProjectList
)
{
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
]
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
1
]
,
""
,
""
,
newOldVO
.
getNewProjectEmployee
().
getId
()
,
newOldVO
.
getNewProjectEmployee
().
getId
(),
newOldVO
.
getOldProjectEmployee
(),
,
newOldVO
.
getOldProjectEmployee
(),
newOldVO
.
getNewProjectEmployee
()
);
newOldVO
.
getNewProjectEmployee
(),
user
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"档案-更新项目档案操作记录错误"
,
e
);
log
.
error
(
"档案-更新项目档案操作记录错误"
,
e
);
...
...
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