西藏国投
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
xuhy
2025-03-21 fd6e1e93f65bde3e1c8c15f36b2ff6324d071966 
 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java


@@ -1,16 +1,21 @@


package com.ruoyi.common.utils;




import org.apache.commons.lang3.time.DateFormatUtils;




import java.lang.management.ManagementFactory;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.*;


import java.time.Instant;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.LocalTime;


import java.time.ZoneId;


import java.time.ZonedDateTime;


import java.time.format.DateTimeFormatter;


import java.util.Calendar;


import java.util.Date;


import java.util.HashMap;


import java.util.Map;




import org.apache.commons.lang3.time.DateFormatUtils;




/**


 * 时间工具类


@@ -267,7 +272,7 @@


        cal.set(Calendar.YEAR, year);


        cal.set(Calendar.MONTH, startMonth);


        cal.set(Calendar.DAY_OF_MONTH, 1);


        cal.set(Calendar.HOUR, 0);


        cal.set(Calendar.HOUR_OF_DAY, 0);


        cal.set(Calendar.MINUTE, 0);


        cal.set(Calendar.SECOND, 0);


        Date first = cal.getTime();


@@ -279,9 +284,9 @@


        cal.set(Calendar.YEAR, year);


        cal.set(Calendar.MONTH, lastMonth);


        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));


        cal.set(Calendar.HOUR, 0);


        cal.set(Calendar.MINUTE, 0);


        cal.set(Calendar.SECOND, 0);


        cal.set(Calendar.HOUR_OF_DAY, 23);


        cal.set(Calendar.MINUTE, 59);


        cal.set(Calendar.SECOND, 59);


        Date last = cal.getTime();


        map.put("last", last);