Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

MrShi

2025-01-06 e1ec365640eefdcb06abb1d73da0d80367f79be3

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -1968,13 +1968,13 @@
    }

    /**
     * 得到当前日期时间,格式为yyyy-MM-dd hh:mm:ss.
     * 得到当前日期时间,格式为yyyy-MM-dd HH:mm:ss.
     *
     * @return String
     */
    public static String getCurrDateTime() {
        Timestamp date = new Timestamp(System.currentTimeMillis());
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        return formatter.format(date);
    }

@@ -2851,7 +2851,8 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            DateUtil.getBeforDays(new Date(),7);
          System.out.println(DateUtil.getPlusTime2( new Date() ));
          System.out.println(DateUtil.getPlusTime2(addMonthToDate(new Date(),3)));

//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
//            Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3055,6 +3056,19 @@
        calendar.add(Calendar.DATE, days);//
        return calendar.getTime();
    }
    public static Date addYearToDate(Date date, int yeas) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.YEAR, yeas);//
        return calendar.getTime();
    }
    public static Date addMonthToDate(Date date, int num) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.MONTH, num);//

        return calendar.getTime();
    }

    public static String afterDateToStr(Integer days){
        Date date = new Date();