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
99fed083
Commit
99fed083
authored
May 15, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
节假日配置表及社保医疗截止配置表调整
parent
2dd1e711
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
TSocialDeadlineInfoServiceImpl.java
...u/social/service/impl/TSocialDeadlineInfoServiceImpl.java
+4
-6
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java
View file @
99fed083
...
...
@@ -401,9 +401,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
private
void
initMedicalEndDate
(
Map
<
String
,
String
>
holidayMap
,
TSocialDeadlineInfo
save
)
{
// type 0 休假 1 补班
String
type
;
type
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getMedicalEndDate
()));
if
(
Common
.
isNotNull
(
type
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
String
day
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getMedicalEndDate
()));
if
(
Common
.
isNotNull
(
day
)){
save
.
setMedicalEndDate
(
DateUtil
.
addDayByDate
(
save
.
getMedicalEndDate
(),
CommonConstants
.
ONE_INT_NEGATE
));
}
else
{
return
;
...
...
@@ -413,9 +412,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
private
void
initSocialEndDate
(
Map
<
String
,
String
>
holidayMap
,
TSocialDeadlineInfo
save
)
{
// type 0 休假 1 补班
String
type
;
type
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getSocialEndDate
()));
if
(
Common
.
isNotNull
(
type
)&&
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
String
day
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getSocialEndDate
()));
if
(
Common
.
isNotNull
(
day
)){
save
.
setSocialEndDate
(
DateUtil
.
addDayByDate
(
save
.
getSocialEndDate
(),
CommonConstants
.
ONE_INT_NEGATE
));
}
else
{
return
;
...
...
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