yumeng 1 year ago
parent
commit
fa0a614e91

+ 22 - 0
ruixuan-common/src/main/java/com/ruixuan/common/utils/DateUtils.java

@@ -49,6 +49,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static Date getNowDate() {
         return new Date();
     }
+
     public static String getNowDate(String format) {
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         Date date = new Date();
@@ -437,6 +438,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return format.format(c.getTime());
     }
 
+    public static String getLastMonthFirstDayByDate(String date) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.setTime(format.parse(date));
+        c.add(Calendar.MONTH, -1);
+        c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
+        return format.format(c.getTime());
+    }
+
     public static String getLastMonthNowDay(String date) throws ParseException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Calendar c = Calendar.getInstance();
@@ -448,6 +458,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
     }
 
+
+    public static String getMonthStartDay(String date) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        c.setTime(format.parse(date));
+        //  c.add(Calendar.MONTH, -1);
+        c.set(Calendar.DAY_OF_MONTH, 1);//设置为1号,当前日期既为本月第一天
+        return format.format(c.getTime());
+
+
+    }
+
     /**
      * 获取 两个日期之间的所有 日期
      *

+ 2 - 2
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -76,9 +76,9 @@ public class JiaoYangReportController extends BaseController {
 
         try {
             String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", date, -1);  //  日期 -1
-            String firstDateByMonth = DateUtils.getFirstDayByMonth(); // 本月第一天
+            String firstDateByMonth = DateUtils.getMonthStartDay(date); // 本月第一天
             // date 为本月结束时间
-            String lastMonthFirstDate = DateUtils.getLastMonthFirstDay();// 上个月开始时间
+            String lastMonthFirstDate = DateUtils.getLastMonthFirstDayByDate(date);// 上个月开始时间
             String lastMonthEndDate = DateUtils.getLastMonthNowDay(date);// 上个月结束时间
             JSONObject dayData = jiaoYangReportService.dayData(DateUtils.strDateTimsToInt(date), DateUtils.strDateTimsToInt(lastDate));
             JSONArray dayArray = new JSONArray();