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
9821423d
You need to sign in or sign up before continuing.
Commit
9821423d
authored
Mar 28, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
40cecf41
3528004a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
23 deletions
+23
-23
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+23
-23
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9821423d
...
...
@@ -933,19 +933,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
**/
@Override
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getDeptId
,
searchCspVo
.
getDeptId
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
searchCspVo
.
getEmpIdCard
())
.
eq
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
EmployeeRegistration:
:
getDataSource
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
registration
))
{
registration
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
baseMapper
.
updateById
(
registration
);
logService
.
saveInnerLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
MESSAGE_FINISH
,
searchCspVo
.
getEmpCreateAndLeaveTime
(),
searchCspVo
.
getEmpCreateAndLeaveUser
(),
null
,
searchCspVo
.
getUserId
()
);
return
null
;
}
else
{
//
EmployeeRegistration registration = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda()
//
.eq(EmployeeRegistration::getDeptId, searchCspVo.getDeptId())
//
.eq(EmployeeRegistration::getEmpIdcard, searchCspVo.getEmpIdCard())
//
.eq(EmployeeRegistration::getProcessStatus, CommonConstants.ZERO_STRING)
//
.eq(EmployeeRegistration::getDataSource,CommonConstants.TWO_STRING)
//
.last(CommonConstants.LAST_ONE_SQL));
//
if (Common.isNotNull(registration)) {
//
registration.setProcessStatus(CommonConstants.TWO_STRING);
//
baseMapper.updateById(registration);
//
logService.saveInnerLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.MESSAGE_FINISH, searchCspVo.getEmpCreateAndLeaveTime(),
//
searchCspVo.getEmpCreateAndLeaveUser(),null,searchCspVo.getUserId() );
//
return null;
//
} else {
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
// 1:加日志
...
...
@@ -956,7 +956,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
else
{
return
null
;
}
}
//
}
}
/**
...
...
@@ -974,8 +974,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
log
.
setMainId
(
belongDept
.
getId
());
log
.
setType
(
CommonConstants
.
ZERO_STRING
);
log
.
setTitle
(
title
);
log
.
setOperationTime
(
searchCspVo
.
getEmpCreateAndLeaveTime
());
log
.
setOperationName
(
searchCspVo
.
getEmpCreateAndLeaveUser
());
log
.
setOperationTime
(
searchCspVo
.
getEmpCreateAndLeaveTime
());
if
(
searchCspVo
.
getEmpCreateAndLeaveTime
()
!=
null
&&
belongDept
.
getLogCreateTime
()
!=
null
&&
searchCspVo
.
getEmpCreateAndLeaveTime
().
isBefore
(
belongDept
.
getLogCreateTime
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
searchCspVo
.
getFeedbackType
()))
{
...
...
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