Skip to content

GitLab

Q
qk_backend
Commit f29e261a authored by shiyu's avatar shiyu
Browse files
Options

修改过去小程序分析数据本周、本月

parent d7fcce8e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
ch-core/src/main/java/com/wwdz/ch/core/util/TimeUtil.java
View file @ f29e261a
...@@ -45,10 +45,7 @@ public final class TimeUtil { ...@@ -45,10 +45,7 @@ public final class TimeUtil {
public static Pair getCurrentWeekDate() { public static Pair getCurrentWeekDate() {
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
Calendar calStart = Calendar.getInstance(); Calendar calStart = Calendar.getInstance();
Calendar calEnd = Calendar.getInstance();
calStart.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); calStart.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
/* calEnd.setFirstDayOfWeek(Calendar.MONDAY);
calEnd.set(Calendar.DAY_OF_WEEK, calEnd.getFirstDayOfWeek() + 6);*/
String beginDate = format.format(calStart.getTime()); String beginDate = format.format(calStart.getTime());
String endDate = format.format(new Date()); String endDate = format.format(new Date());
return Pair.of(beginDate, endDate); return Pair.of(beginDate, endDate);
...@@ -94,9 +91,7 @@ public final class TimeUtil { ...@@ -94,9 +91,7 @@ public final class TimeUtil {
public static Pair getCurrentMonthDate() { public static Pair getCurrentMonthDate() {
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
Calendar calStart = Calendar.getInstance(); Calendar calStart = Calendar.getInstance();
Calendar calEnd = Calendar.getInstance();
calStart.set(Calendar.DAY_OF_MONTH, 1); calStart.set(Calendar.DAY_OF_MONTH, 1);
// calEnd.set(Calendar.DAY_OF_MONTH, calEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
String beginDate = format.format(calStart.getTime()); String beginDate = format.format(calStart.getTime());
String endDate = format.format(new Date()); String endDate = format.format(new Date());
return Pair.of(beginDate, endDate); return Pair.of(beginDate, endDate);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment