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
f8f39414
Commit
f8f39414
authored
Jun 30, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huyc 项目档案代码提交
parent
e48e84d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+3
-5
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
f8f39414
...
@@ -115,11 +115,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -115,11 +115,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(!
Common
.
isEmpty
(
tEmployeeInfo
))
{
if
(!
Common
.
isEmpty
(
tEmployeeInfo
))
{
map
.
put
(
"empProId"
,
tEmployeeProject
.
getId
());
map
.
put
(
"empProId"
,
tEmployeeProject
.
getId
());
if
(
CommonConstants
.
STATUS_NORMAL
.
equals
(
tEmployeeInfo
.
getFileStatus
()))
{
if
(
CommonConstants
.
STATUS_NORMAL
.
equals
(
tEmployeeInfo
.
getFileStatus
()))
{
return
R
.
ok
(
map
,
"该人员已减项,是否“复项”"
);
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
4
],
"该人员已减项,是否“复项”"
,
map
);
}
else
{
}
else
{
map
.
put
(
"code"
,
"202"
);
map
.
put
(
"employeeId"
,
tEmployeeInfo
.
getId
());
map
.
put
(
"employeeId"
,
tEmployeeInfo
.
getId
());
return
R
.
ok
(
map
,
"该人员已减档减项,是否“复档复项”"
);
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
2
],
"该人员已减档减项,是否“复档复项”"
,
map
);
}
}
}
}
}
}
...
@@ -135,8 +134,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -135,8 +134,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//判断是否已经减档
//判断是否已经减档
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tEmployeeInfo
.
getFileStatus
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tEmployeeInfo
.
getFileStatus
()))
{
map
.
put
(
"employeeId"
,
tEmployeeInfo
.
getId
());
map
.
put
(
"employeeId"
,
tEmployeeInfo
.
getId
());
map
.
put
(
"code"
,
"203"
);
return
new
R
<>(
CommonConstants
.
dingleDigitIntArray
[
3
],
"该人员在离职库已存在,是否“恢复档案”"
,
map
);
return
R
.
ok
(
map
,
"该人员在离职库已存在,是否“恢复档案”"
);
}
}
}
}
return
R
.
ok
();
return
R
.
ok
();
...
...
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