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
f1407af4
You need to sign in or sign up before continuing.
Commit
f1407af4
authored
Dec 26, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职确认信息编辑提交
parent
8e2e30de
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+2
-1
EkpDeptContractInfoVo.java
.../com/yifu/cloud/plus/v1/ekp/vo/EkpDeptContractInfoVo.java
+1
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
f1407af4
...
...
@@ -1032,7 +1032,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
R
<
EkpDeptContractInfoVo
>
info
=
ekpDaprUtils
.
selectContractInfoByDetptNo
(
infoVo
);
if
(
Common
.
isNotNull
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
EkpDeptContractInfoVo
returnVo
=
info
.
getData
();
employeeContractPreVo
.
setContractEnd
(
returnVo
.
getContractEndTime
());
employeeContractPreVo
.
setContractEnd
(
null
!=
returnVo
.
getContractEndTime
()
?
DateUtil
.
stringToDate
(
returnVo
.
getContractEndTime
())
:
null
);
}
else
{
employeeContractPreVo
.
setContractEnd
(
null
);
}
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpDeptContractInfoVo.java
View file @
f1407af4
...
...
@@ -21,7 +21,7 @@ public class EkpDeptContractInfoVo implements Serializable {
/**
* 合同截至日期
**/
private
Date
contractEndTime
;
private
String
contractEndTime
;
/**
* 项目编码
**/
...
...
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