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
5f93b63c
Commit
5f93b63c
authored
Mar 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-自动顺延到1号
parent
cdef9efb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
4 deletions
+27
-4
DateUtil.java
...om/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
+18
-0
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+9
-4
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
View file @
5f93b63c
...
...
@@ -1372,6 +1372,24 @@ public class DateUtil {
cal
.
add
(
Calendar
.
MONTH
,
mnt
);
return
cal
.
getTime
();
}
/**
* @Description: 增减(月),并且设置为1号1点
* @Author: hgw
* @Date: 2022/8/3 9:17
* @return: java.util.Date
**/
public
static
Date
addMonthByDateToOne
(
Date
date
,
int
mnt
)
{
Calendar
cal
=
Calendar
.
getInstance
();
if
(
date
!=
null
)
{
cal
.
setTime
(
date
);
}
cal
.
add
(
Calendar
.
MONTH
,
mnt
);
cal
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
cal
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
cal
.
set
(
Calendar
.
MINUTE
,
0
);
cal
.
set
(
Calendar
.
SECOND
,
1
);
return
cal
.
getTime
();
}
// fxj编写的获取当前时间,并替换 日
public
static
Date
getDayOfThisMonth
(
int
day
){
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
5f93b63c
...
...
@@ -273,12 +273,17 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// 医保起缴月顺延:
if
(
"已核定过基本医疗保险"
.
equals
(
failConfig
.
getReasonKey
()))
{
Date
nextDate
;
Date
nextMonth
=
DateUtil
.
addMonthByDate
(
new
Date
(),
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdSocialStartDateNext
()))
{
nextDate
=
DateUtil
.
addMonthByDate
(
socialInfo
.
getYsdSocialStartDateNext
(),
CommonConstants
.
ONE_INT
);
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
nextDate
=
DateUtil
.
addMonthByDateToOne
(
socialInfo
.
getYsdSocialStartDateNext
(),
CommonConstants
.
ONE_INT
);
if
(
nextDate
.
before
(
nextMonth
))
{
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
}
}
else
if
(
Common
.
isNotNull
(
socialInfo
.
getSocialStartDate
()))
{
nextDate
=
DateUtil
.
addMonthByDate
(
socialInfo
.
getSocialStartDate
(),
CommonConstants
.
ONE_INT
);
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
nextDate
=
DateUtil
.
addMonthByDateToOne
(
socialInfo
.
getSocialStartDate
(),
CommonConstants
.
ONE_INT
);
if
(
nextDate
.
before
(
nextMonth
))
{
updateSocial
.
setYsdSocialStartDateNext
(
nextDate
);
}
}
}
ysdHandleStatus
=
CommonConstants
.
THREE_STRING
;
...
...
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