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
b01c2dfc
Commit
b01c2dfc
authored
Apr 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
a3b1fdeb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+10
-10
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.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 @
b01c2dfc
...
...
@@ -580,11 +580,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if
(
insurancePreVo
.
getBuyType
()
==
1
&&
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
()).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getExpectedCollectionTime
()))>
0
)
{
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setExpectedCollectionTime
(
registration
.
getJoinLeaveDate
());
}
//
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
//
if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) {
//
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
//
insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate());
//
}
}
if
(!
errorList
.
isEmpty
())
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
errorList
);
...
...
@@ -685,11 +685,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo
.
setPolicyEffect
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
}
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if
(
insurancePreVo
.
getBuyType
()
==
1
&&
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
()).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getExpectedCollectionTime
()))>
0
)
{
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setExpectedCollectionTime
(
registration
.
getJoinLeaveDate
());
}
//
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
//
if (insurancePreVo.getBuyType() == 1 && DateUtil.dateToString(registration.getJoinLeaveDate()).compareTo(DateUtil.dateToString(insurancePreVo.getExpectedCollectionTime()))>0) {
//
insurancePreVo.setPolicyStart(registration.getJoinLeaveDate());
//
insurancePreVo.setExpectedCollectionTime(registration.getJoinLeaveDate());
//
}
//入职日期需要小于保单截止日期
if
((
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
>
0
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
b01c2dfc
...
...
@@ -329,7 +329,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
if
(
givenLocalDate
.
isBefore
(
today
)
||
givenLocalDate
.
isEqual
(
today
))
{
// 如果日期前一个工作日日期小于等于今天
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
30
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
3
0
)))
{
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
20
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
2
0
)))
{
// 如果当前时间在15:20之前
vo
.
setPriDisDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDisDate
(),
CommonConstants
.
ONE_INT
));
...
...
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