Commit 74e983fc authored by fangxinjiang's avatar fangxinjiang

版本切换-fxj

parent 95a0457f
package com.yifu.cloud.plus.v1.yifu.common.core.util; package com.yifu.cloud.plus.v1.yifu.common.core.util;
import com.alibaba.excel.converters.date.DateDateConverter;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.sms.MonthObject; import com.yifu.cloud.plus.v1.yifu.common.core.util.sms.MonthObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -1984,6 +1983,20 @@ public class DateUtil { ...@@ -1984,6 +1983,20 @@ public class DateUtil {
return false; return false;
} }
/**
* @Author fxj
* @Description 判断 日期 date 是否在 registDate 之后,在返回true,否则返回false
* @Date 15:10 2025/12/12
* @Param
* @return
**/
public static boolean isBefore(Date date, Date registDate) {
if (date.getTime() < registDate.getTime()) {
return true;
}
return false;
}
/** /**
* 日期月份类型枚举 * 日期月份类型枚举
*/ */
...@@ -2014,7 +2027,7 @@ public class DateUtil { ...@@ -2014,7 +2027,7 @@ public class DateUtil {
} }
// 获取当前月份的第一天 // 获取当前月份的第一天
Date currentMonthFirstDay = DateUtil.setDayByDate(new Date(), 1); Date currentMonthFirstDay = DateUtil.setDayByDate(DateUtil.formatDateByPatten(new Date(), DateUtil.ISO_EXPANDED_DATE_FORMAT), 1);
// 获取下个月的第一天 // 获取下个月的第一天
Date nextMonthFirstDay = DateUtil.addMonthByDate(currentMonthFirstDay, 1); Date nextMonthFirstDay = DateUtil.addMonthByDate(currentMonthFirstDay, 1);
...@@ -2023,11 +2036,11 @@ public class DateUtil { ...@@ -2023,11 +2036,11 @@ public class DateUtil {
Date nextNextMonthFirstDay = DateUtil.addMonthByDate(currentMonthFirstDay, 2); Date nextNextMonthFirstDay = DateUtil.addMonthByDate(currentMonthFirstDay, 2);
// 判断目标日期是否早于下个月第一天 // 判断目标日期是否早于下个月第一天
if (!DateUtil.isAfter(targetDate, nextMonthFirstDay)) { if (DateUtil.isBefore(targetDate, nextMonthFirstDay)) {
return MonthType.CURRENT_OR_BEFORE; return MonthType.CURRENT_OR_BEFORE;
} }
// 判断目标日期是否早于下下个月第一天 // 判断目标日期是否早于下下个月第一天
else if (!DateUtil.isAfter(targetDate, nextNextMonthFirstDay)) { else if (DateUtil.isBefore(targetDate, nextNextMonthFirstDay)) {
return MonthType.NEXT_MONTH; return MonthType.NEXT_MONTH;
} }
// 其他情况为次次月及之后 // 其他情况为次次月及之后
......
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