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
9fd53eba
Commit
9fd53eba
authored
Mar 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-状态
parent
4fd0e170
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
EmployeeRegistrationPreService.java
...yifu/archives/service/EmployeeRegistrationPreService.java
+3
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+13
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-5
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
View file @
9fd53eba
...
@@ -86,6 +86,9 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
...
@@ -86,6 +86,9 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
void
updatePreStatusToEnd
(
String
deptNo
,
String
empIdcard
);
void
updatePreStatusToEnd
(
String
deptNo
,
String
empIdcard
);
// 更新为待审核
void
updatePreStatusToTwo
(
String
deptId
,
String
empIdCard
);
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
cardOrId
);
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
cardOrId
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
9fd53eba
...
@@ -491,6 +491,19 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -491,6 +491,19 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
}
}
@Override
public
void
updatePreStatusToTwo
(
String
deptId
,
String
empIdCard
)
{
EmployeeRegistrationPre
registrationPre
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistrationPre
>
query
().
lambda
()
.
eq
(
EmployeeRegistrationPre:
:
getEmpIdcard
,
empIdCard
)
.
eq
(
EmployeeRegistrationPre:
:
getDeptId
,
deptId
)
.
eq
(
EmployeeRegistrationPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
registrationPre
))
{
registrationPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
baseMapper
.
updateById
(
registrationPre
);
}
}
@Override
@Override
public
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
id
)
{
public
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
id
)
{
//获取人员档案id
//获取人员档案id
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
9fd53eba
...
@@ -1571,13 +1571,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1571,13 +1571,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
R
.
failed
(
"档案原ID不可为空!"
);
return
R
.
failed
(
"档案原ID不可为空!"
);
}
}
}
else
{
}
else
{
main
.
setStatus
(
status
);
// 有信息,就跳转到待审核
// 有信息,就跳转到待审核
if
(
pre
!=
null
&&
Common
.
isNotNull
(
pre
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
status
))
{
if
(
pre
!=
null
&&
Common
.
isNotNull
(
pre
.
getId
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
status
))
{
main
.
setStatus
(
CommonConstants
.
TWO_STRING
);
main
.
setStatus
(
CommonConstants
.
TWO_STRING
);
if
(
Common
.
isEmpty
(
pre
.
getProcessStatus
())
||
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
registrationPreService
.
updatePreStatusToTwo
(
main
.
getDeptId
(),
idCard
);
pre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
registrationPreService
.
updateById
(
pre
);
}
if
(
isSimpleBoo
)
{
if
(
isSimpleBoo
)
{
main
.
setStatus
(
CommonConstants
.
FOUR_STRING
);
main
.
setStatus
(
CommonConstants
.
FOUR_STRING
);
// 审核日志
// 审核日志
...
@@ -1592,7 +1590,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1592,7 +1590,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
updateToEmployeeByPre
(
vo
,
isSimpleBoo
);
updateToEmployeeByPre
(
vo
,
isSimpleBoo
);
}
}
}
}
main
.
setStatus
(
status
);
main
.
setCreateBy
(
user
.
getId
());
main
.
setCreateBy
(
user
.
getId
());
main
.
setCreateName
(
user
.
getNickname
());
main
.
setCreateName
(
user
.
getNickname
());
main
.
setCreateTime
(
LocalDateTime
.
now
());
main
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
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