Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-02-28 69283b5a4559509187516355602e32e4bdac9d5d

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

@@ -68,11 +68,28 @@
        return dt1;
    }



    public static Date StringToDateFormat(String DATE,String format) {
        if(StringUtils.isBlank(DATE)){
            return null;
        }
        DateFormat df = new SimpleDateFormat(format);
        Date dt1 = null;
        try {
            dt1 = df.parse(DATE);
        } catch (Exception exception) {
            exception.printStackTrace();
        }
        return dt1;
    }


    public static String getXDaysAfter(Date date, Integer days){
        Timestamp currentTimestamp = new Timestamp(date.getTime());
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(currentTimestamp);
        calendar.add(Calendar.DAY_OF_YEAR, days-1); // 在当前时间基础上添加指定的天数
        calendar.add(Calendar.DAY_OF_YEAR, days); // 在当前时间基础上添加指定的天数
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
        return formatter.format(calendar.getTime());
    }
@@ -2771,7 +2788,7 @@

    public static void main(String[] args) {
        try {
            System.out.println(DateUtil.getBetweenDays("2025-02-13","2025-02-15"));
            System.out.println(DateUtil.getCurrDate());
        } catch (Exception ex) {
            ex.printStackTrace();
        }