|
@@ -1,5 +1,6 @@
|
|
|
package com.nb.bus.enums;
|
|
package com.nb.bus.enums;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.baomidou.mybatisplus.annotation.IEnum;
|
|
import com.baomidou.mybatisplus.annotation.IEnum;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
@@ -26,8 +27,8 @@ public enum StatsTimeUnit implements IEnum<Integer> {
|
|
|
WEEK(2){
|
|
WEEK(2){
|
|
|
@Override
|
|
@Override
|
|
|
public String parse(Date date) {
|
|
public String parse(Date date) {
|
|
|
- String prefix= DateUtil.format(date, "yyyy年MM月");
|
|
|
|
|
- return prefix+"第"+DateUtil.weekOfMonth(date)+"周";
|
|
|
|
|
|
|
+ String prefix= DateUtil.format(date, "yyyy年");
|
|
|
|
|
+ return prefix+"第"+DateUtil.weekOfMonth(date)+"周("+DateUtil.formatDate(DateUtil.beginOfWeek(date))+"-"+DateUtil.formatDate(DateUtil.beginOfWeek(date))+")";
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
MONTH(3){
|
|
MONTH(3){
|
|
@@ -47,4 +48,5 @@ public enum StatsTimeUnit implements IEnum<Integer> {
|
|
|
* @return String
|
|
* @return String
|
|
|
*/
|
|
*/
|
|
|
public abstract String parse(Date date);
|
|
public abstract String parse(Date date);
|
|
|
|
|
+
|
|
|
}
|
|
}
|