|
|
@@ -1,6 +1,8 @@
|
|
|
package com.gyee.runeconomy.service.homepage;
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.gyee.common.model.PointData;
|
|
|
@@ -1768,8 +1770,8 @@ public class EconomyPointHomePageService {
|
|
|
for (Integer mon : day1sMap.keySet()) {
|
|
|
List<TurbineInfoDay> day1s1 = day1sMap.get(mon);
|
|
|
List<TurbineInfoDay> day1s2 = day1s1.stream().sorted(Comparator.comparing(TurbineInfoDay::getRecordDate).reversed()).collect(Collectors.toList());
|
|
|
- LocalDate localDate = day1s2.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
|
|
|
- int year1 = localDate.getYear();
|
|
|
+ DateTime localDate = DateUtil.date(day1s2.get(0).getRecordDate());
|
|
|
+ int year1 = localDate.year();
|
|
|
String text = year1 + "-" + mon;
|
|
|
for (ValueVo vv : vexdl) {
|
|
|
if (vv.getText().equals(text)) {
|
|
|
@@ -1826,8 +1828,8 @@ public class EconomyPointHomePageService {
|
|
|
for (Integer mon2 : day1sMap2.keySet()) {
|
|
|
List<TurbineInfoDay> day1s3 = day1sMap2.get(mon2);
|
|
|
List<TurbineInfoDay> day1s4 = day1s3.stream().sorted(Comparator.comparing(TurbineInfoDay::getRecordDate).reversed()).collect(Collectors.toList());
|
|
|
- LocalDate localDate = day1s3.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
|
|
|
- int year1 = localDate.getYear();
|
|
|
+ DateTime localDate = DateUtil.date(day1s3.get(0).getRecordDate());
|
|
|
+ int year1 = localDate.year();
|
|
|
String text = year1 + "-" + mon2;
|
|
|
for (ValueVo vv : vxdl2) {
|
|
|
if (vv.getText().equals(text)) {
|