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
282fcea0
Commit
282fcea0
authored
May 15, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目档案无岗位更新岗位fxj 2024-04-17
parent
99fed083
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
DateUtil.java
...om/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
+9
-0
TSocialDeadlineInfoServiceImpl.java
...u/social/service/impl/TSocialDeadlineInfoServiceImpl.java
+2
-2
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
View file @
282fcea0
...
...
@@ -1317,6 +1317,15 @@ public class DateUtil {
return
cal
.
getTime
();
}
public
static
Date
getDateOfThisMonth
(
Date
date
){
Calendar
cal
=
Calendar
.
getInstance
();
if
(
date
!=
null
)
{
cal
.
setTime
(
date
);
}
cal
.
set
(
Calendar
.
MONTH
,
Integer
.
valueOf
(
DateUtil
.
getMonth
(
new
Date
()))-
1
);
return
cal
.
getTime
();
}
/**
* @Description: 增减(日)
* @Author: hgw
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java
View file @
282fcea0
...
...
@@ -296,8 +296,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
save
.
setId
(
null
);
save
.
setMonth
(
Integer
.
parseInt
(
DateUtil
.
getThisMonth
()));
save
.
setType
(
CommonConstants
.
ZERO_STRING
);
save
.
setSocialEndDate
(
DateUtil
.
addMonthByDate
(
save
.
getSocialEndDate
(),
CommonConstants
.
ONE_INT
));
save
.
setMedicalEndDate
(
DateUtil
.
addMonthByDate
(
save
.
getMedicalEndDate
(),
CommonConstants
.
ONE_INT
));
save
.
setSocialEndDate
(
DateUtil
.
getDateOfThisMonth
(
save
.
getSocialEndDate
()
));
save
.
setMedicalEndDate
(
DateUtil
.
getDateOfThisMonth
(
save
.
getMedicalEndDate
()
));
initSocialEndDate
(
holidayMap
,
save
);
initMedicalEndDate
(
holidayMap
,
save
);
queryWrapper
=
initCountQuery
(
save
,
queryWrapper
);
...
...
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