Commit 5f93b63c authored by hongguangwu's avatar hongguangwu

MVP1.7.8-自动顺延到1号

parent cdef9efb
......@@ -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){
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment