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
01643a65
Commit
01643a65
authored
Nov 27, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
12f33d9e
f73a69ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+4
-2
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+1
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
01643a65
...
...
@@ -554,8 +554,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 获取下一个工作日
public
LocalDate
getNextWorkday
(
LocalDate
date
,
Map
<
String
,
Integer
>
holidayMap
)
{
LocalDate
result
=
date
.
plusDays
(
CommonConstants
.
ONE_INT
);
while
(!
this
.
isWorkday
(
date
,
holidayMap
))
{
int
i
=
100
;
while
(
i
>
0
&&
!
this
.
isWorkday
(
result
,
holidayMap
))
{
result
=
result
.
plusDays
(
CommonConstants
.
ONE_INT
);
i
--;
}
return
result
;
}
...
...
@@ -1074,7 +1076,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
EmployeeRegistrationLeaveLog
leaveLog
;
String
preContent
=
"立即发起全部日期的事项:"
;
if
(
Common
.
isNotNull
(
isExit
)
&&
isExit
.
equals
(
CommonConstants
.
ONE_STRING
))
{
preContent
+
=
"立即发起今日及之前的事项:"
;
preContent
=
"立即发起今日及之前的事项:"
;
}
StringBuilder
logSubType
;
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
01643a65
...
...
@@ -416,7 +416,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
// 获取下一个工作日
public
LocalDate
getNextWorkday
(
LocalDate
date
,
Map
<
String
,
Integer
>
holidayMap
)
{
LocalDate
result
=
date
.
plusDays
(
CommonConstants
.
ONE_INT
);
while
(!
this
.
isWorkday
(
date
,
holidayMap
))
{
while
(!
this
.
isWorkday
(
result
,
holidayMap
))
{
result
=
result
.
plusDays
(
CommonConstants
.
ONE_INT
);
}
return
result
;
...
...
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