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
bc5f3fc9
Commit
bc5f3fc9
authored
Dec 12, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
截止日期 -fxj
parent
243f5933
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
0 deletions
+39
-0
TSocialDeadlineInfoServiceImpl.java
...u/social/service/impl/TSocialDeadlineInfoServiceImpl.java
+39
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java
View file @
bc5f3fc9
...
...
@@ -307,12 +307,29 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
if
(
Common
.
isNotNull
(
save
.
getSocialEndDate
()))
{
save
.
setSocialEndDate
(
this
.
getNewDateByOldDate
(
save
.
getSocialEndDate
()));
}
//2024-12-09 fxj v1.7.3
if
(
Common
.
isNotNull
(
save
.
getSocialStartDateReduce
())){
save
.
setSocialStartDateReduce
(
this
.
getNewDateByOldDate
(
save
.
getSocialStartDateReduce
()));
}
if
(
Common
.
isNotNull
(
save
.
getSocialEndDateReduce
())){
save
.
setSocialEndDateReduce
(
this
.
getNewDateByOldDate
(
save
.
getSocialEndDateReduce
()));
}
if
(
Common
.
isNotNull
(
save
.
getMedicalStartDateReduce
())){
save
.
setMedicalStartDateReduce
(
this
.
getNewDateByOldDate
(
save
.
getMedicalStartDateReduce
()));
}
if
(
Common
.
isNotNull
(
save
.
getMedicalEndDateReduce
())){
save
.
setMedicalEndDateReduce
(
this
.
getNewDateByOldDate
(
save
.
getMedicalEndDateReduce
()));
}
initSocialEndDate
(
holidayMap
,
save
);
initMedicalEndDate
(
holidayMap
,
save
);
//处理社保减少截止时间和医保减少截止时间
initSocialEndDateReduce
(
holidayMap
,
save
);
initMedicalEndDateReduce
(
holidayMap
,
save
);
save
.
setUpdateTime
(
null
);
save
.
setUpdateBy
(
null
);
save
.
setUpdateName
(
null
);
//已存在跳过
queryWrapper
=
initCountQuery
(
save
,
queryWrapper
);
if
(
baseMapper
.
selectCount
(
queryWrapper
)
>
0
){
continue
;
...
...
@@ -458,6 +475,28 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
initSocialEndDate
(
holidayMap
,
save
);
}
private
void
initSocialEndDateReduce
(
Map
<
String
,
String
>
holidayMap
,
TSocialDeadlineInfo
save
)
{
// type 0 休假 1 补班
String
day
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getSocialEndDateReduce
()));
if
(
Common
.
isNotNull
(
day
)){
save
.
setSocialEndDateReduce
(
DateUtil
.
addDayByDate
(
save
.
getSocialEndDateReduce
(),
CommonConstants
.
ONE_INT_NEGATE
));
}
else
{
return
;
}
initSocialEndDateReduce
(
holidayMap
,
save
);
}
private
void
initMedicalEndDateReduce
(
Map
<
String
,
String
>
holidayMap
,
TSocialDeadlineInfo
save
)
{
// type 0 休假 1 补班
String
day
=
holidayMap
.
get
(
DateUtil
.
getDay
(
save
.
getMedicalEndDateReduce
()));
if
(
Common
.
isNotNull
(
day
)){
save
.
setMedicalEndDateReduce
(
DateUtil
.
addDayByDate
(
save
.
getMedicalEndDateReduce
(),
CommonConstants
.
ONE_INT_NEGATE
));
}
else
{
return
;
}
initMedicalEndDateReduce
(
holidayMap
,
save
);
}
/**
* @Description: 获取 当月启用 的配置
* @Author: hgw
...
...
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