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
cee73b57
Commit
cee73b57
authored
Mar 27, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记提交
parent
8d03f0f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
9 deletions
+26
-9
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+4
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+22
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
cee73b57
...
@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
project
.
setProjectSource
(
CommonConstants
.
ONE_STRING
);
project
.
setProjectSource
(
CommonConstants
.
ONE_STRING
);
project
.
setEmpNo
(
tEmployeeProjectService
.
getEmpNo
(
project
.
getDeptNo
()));
project
.
setEmpNo
(
tEmployeeProjectService
.
getEmpNo
(
project
.
getDeptNo
()));
tEmployeeProjectService
.
save
(
project
);
tEmployeeProjectService
.
save
(
project
);
// 增加,同步CSP
tEmployeeProjectService
.
doSaveBelongDept
(
project
,
CommonConstants
.
ONE_STRING
);
// 更新入职待建档状态为已完成
registrationPreService
.
updatePreStatusToEnd
(
project
.
getDeptNo
(),
project
.
getEmpIdcard
());
projectAdd
.
setId
(
project
.
getId
());
projectAdd
.
setId
(
project
.
getId
());
projectAdd
.
setEmpNo
(
project
.
getEmpNo
());
projectAdd
.
setEmpNo
(
project
.
getEmpNo
());
projectsMap
.
put
(
project
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
project
.
getDeptNo
(),
projectAdd
);
projectsMap
.
put
(
project
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
project
.
getDeptNo
(),
projectAdd
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
cee73b57
...
@@ -933,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -933,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
**/
**/
@Override
@Override
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
public
TEmployeeProjectBelongDept
getZeroRegistrationAndUpdateTwo
(
TEmployeeProjectBelongDeptSearchCspVo
searchCspVo
)
{
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
EmployeeRegistration
registration
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
.
eq
(
EmployeeRegistration:
:
getDeptId
,
searchCspVo
.
getDeptId
())
// 1:加日志
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
searchCspVo
.
getEmpIdCard
())
if
(
doSaveLogBatch
(
searchCspVo
,
belongDeptList
))
return
null
;
.
eq
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
ZERO_STRING
)
// 更新为已处理
.
eq
(
EmployeeRegistration:
:
getDataSource
,
CommonConstants
.
TWO_STRING
)
baseMapper
.
updateTwoRegistrationByIdCard
(
searchCspVo
);
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
belongDeptList
.
get
(
0
);
if
(
Common
.
isNotNull
(
registration
))
{
}
else
{
registration
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
baseMapper
.
updateById
(
registration
);
logService
.
saveLog
(
registration
.
getId
(),
CommonConstants
.
ZERO_STRING
,
RegistConstants
.
MESSAGE_FINISH
,
searchCspVo
.
getEmpCreateAndLeaveTime
(),
searchCspVo
.
getEmpCreateAndLeaveUser
(),
RegistConstants
.
BEFORE_IN_PROJECT
);
return
null
;
return
null
;
}
else
{
List
<
TEmployeeProjectBelongDept
>
belongDeptList
=
baseMapper
.
getZeroRegistrationByIdCard
(
searchCspVo
);
if
(
belongDeptList
!=
null
&&
!
belongDeptList
.
isEmpty
())
{
// 1:加日志
if
(
doSaveLogBatch
(
searchCspVo
,
belongDeptList
))
return
null
;
// 更新为已处理
baseMapper
.
updateTwoRegistrationByIdCard
(
searchCspVo
);
return
belongDeptList
.
get
(
0
);
}
else
{
return
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