Merge branch 'xin' into pxb

彭雪彬

2025-09-04 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9

 oying-common/src/main/java/com/oying/utils/DateUtil.java

@@ -18,15 +18,36 @@
    public static final DateTimeFormatter DFY_M = DateTimeFormatter.ofPattern("yyyy-MM");
    public static final DateTimeFormatter SDF_YMDHMS = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");

    public static boolean isBefore(String date, int count) {
        LocalDateTime time = LocalDateTime.parse(date, SDF_YMDHMS);
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime nowPlus30 = time.plusDays(count);

        // 检查目标时间是否在 [time, time+count天] 区间内
        return !now.isBefore(time) && !now.isAfter(nowPlus30);
    }

    /**
     * Timestamp增加分钟
     * Timestamp增减天
     */
    public static Timestamp addMinute(Timestamp time, int month) {
    public static Timestamp addDay(Timestamp time, int count) {
        // 创建 Calendar 对象并设置为当前日期和时间的值
        Calendar calendar = Calendar.getInstance();
        calendar.setTimeInMillis(time.getTime());
        // 将MINUTE字段添加到当前日期和时间
        calendar.add(Calendar.MINUTE, month);
        calendar.add(Calendar.DATE, count);
        return new Timestamp(calendar.getTime().getTime());
    }

    /**
     * Timestamp增减分钟
     */
    public static Timestamp addMinute(Timestamp time, int count) {
        // 创建 Calendar 对象并设置为当前日期和时间的值
        Calendar calendar = Calendar.getInstance();
        calendar.setTimeInMillis(time.getTime());
        // 将MINUTE字段添加到当前日期和时间
        calendar.add(Calendar.MINUTE, count);
        return new Timestamp(calendar.getTime().getTime());
    }

@@ -128,6 +149,7 @@

    /**
     * 获取当前时间yyyyMMdd
     *
     * @return 、yyyyMMdd
     */
    public static String getNowTimeTypeYYYYMMDD() {
@@ -136,6 +158,7 @@

    /**
     * 获取当前时间yyyyMM
     *
     * @return 、yyyyMM
     */
    public static String getNowTimeTypeYYYYMM() {