screen-api 修改manageBug

kaiyu

2021-07-15 ab676b53eaeb3779d0beaf9f525a63eb3d5e60d0

 screen-common/src/main/java/com/moral/util/DateUtils.java

@@ -761,6 +761,17 @@
    }

    /**
     * 获取当前月第一天
     *
     * @return
     */
    public static Date getFirstDayOfCurrMonth() {
        Calendar cal = Calendar.getInstance();
        cal.set(Calendar.DAY_OF_MONTH, 1);
        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
    }

    /**
     * 获取当前月的最后一天
     *
     * @return
@@ -769,8 +780,7 @@
        Calendar cal = Calendar.getInstance();
        cal.add(Calendar.MONTH, 1);
        cal.set(Calendar.DAY_OF_MONTH, 0);

        return cal.getTime();
        return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
    }

    /**
@@ -1301,12 +1311,6 @@
        return date;
    }

    //当前时间转换，只取到分钟
    public static Date convertDate(Date date) {
        String dateString = dateToDateString(date, yyyy_MM_dd_HH_mm_EN);
        return getDate(dateString, yyyy_MM_dd_HH_mm_EN);
    }

    //时间戳转换，只取时分秒
    public static Date dataToTimeStampTime(Date time, String dateFormat) {
        String dateString = dateToDateString(time, dateFormat);
@@ -1317,7 +1321,23 @@
        }
    }

    public static void main(String[] args) throws InterruptedException {
        System.out.println(new Date().getTime());
    //获取上周一
    public static Date getLastWeekMonday() {
        Calendar cal = Calendar.getInstance();
        cal.setTime(getDate(getMondayOfThisWeek(), yyyy_MM_dd_EN));
        cal.add(Calendar.DATE, -7);
        return cal.getTime();
    }

    //获取上月第一天
    public static Date getFirstDayOfLastMonth() {
        Calendar calendar = Calendar.getInstance();
        calendar.add(Calendar.MONTH, -1);
        calendar.set(Calendar.DAY_OF_MONTH, 1);
        return getDate(dateToDateString(calendar.getTime(), yyyy_MM_dd_EN));
    }

    public static void main(String[] args) {
        System.out.println(getFirstDayOfCurrMonth());
    }
}