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
15bd3f09
Commit
15bd3f09
authored
Mar 31, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预计收集时间优化-fxj
parent
4d27c995
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+8
-5
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
15bd3f09
...
@@ -2369,9 +2369,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2369,9 +2369,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
else
if
((
CommonConstants
.
ONE_STRING
.
equals
(
pushType
)
||
CommonConstants
.
TWO_STRING
.
equals
(
pushType
))
else
if
((
CommonConstants
.
ONE_STRING
.
equals
(
pushType
)
||
CommonConstants
.
TWO_STRING
.
equals
(
pushType
))
&&
registration
.
getJoinLeaveDate
()
!=
null
)
{
&&
registration
.
getJoinLeaveDate
()
!=
null
)
{
int
workDaysBefore
=
CommonConstants
.
ONE_STRING
.
equals
(
pushType
)
?
3
:
5
;
int
workDaysBefore
=
CommonConstants
.
ONE_STRING
.
equals
(
pushType
)
?
3
:
5
;
LocalDate
tempDate
=
parseContractEndDate
(
registration
.
getJoinLeaveDate
(),
preVo
.
getPushDate
());
LocalDate
tempDate
=
parseContractEndDate
(
registration
.
getJoinLeaveDate
());
tempDate
=
calculateReminderWorkDaysBefore
(
tempDate
,
workDaysBefore
,
1
);
tempDate
=
calculateReminderWorkDaysBefore
(
tempDate
,
workDaysBefore
,
0
);
preVo
.
setExpectedCollectionTime
(
DateUtil
.
getDateByLocalDate
(
tempDate
));
Date
temp
=
DateUtil
.
getDateByLocalDate
(
tempDate
);
preVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
temp
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" "
+
preVo
.
getPushDate
(),
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
throw
new
RuntimeException
(
"预期收款日期计算失败"
);
throw
new
RuntimeException
(
"预期收款日期计算失败"
);
...
@@ -2888,9 +2891,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2888,9 +2891,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
/**
/**
* 解析合同结束日期
* 解析合同结束日期
*/
*/
private
LocalDate
parseContractEndDate
(
Date
contractEnd
,
String
pushDate
)
{
private
LocalDate
parseContractEndDate
(
Date
contractEnd
)
{
try
{
try
{
return
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
dateToString
(
contractEnd
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" "
+
pushDate
);
return
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
dateToString
(
contractEnd
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
return
null
;
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