|
@@ -24,7 +24,11 @@ import org.springframework.stereotype.Service;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Collections;
|
|
|
+import java.util.Comparator;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -156,7 +160,6 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
for (JSONObject data : dataList) {
|
|
|
newDayList.add(data.getString("statDate"));
|
|
|
}
|
|
|
-
|
|
|
for (String day : dayList) {
|
|
|
if (!newDayList.contains(day)) {
|
|
|
JSONObject obj = new JSONObject();
|
|
@@ -165,8 +168,26 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
|
|
|
dataList.add(obj);
|
|
|
}
|
|
|
}
|
|
|
+ //按时间排序
|
|
|
+ userRechargeListSort(dataList);
|
|
|
}
|
|
|
|
|
|
+ private static void userRechargeListSort(List<JSONObject> list) {
|
|
|
+ Collections.sort(list, new Comparator<JSONObject>() {
|
|
|
+ @Override
|
|
|
+ public int compare(JSONObject o1, JSONObject o2) {
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ try {
|
|
|
+ Date dt1 = format.parse(o1.getString("statDate"));
|
|
|
+ Date dt2 = format.parse(o2.getString("statDate"));
|
|
|
+ return dt1.compareTo(dt2);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public Result<Object> getMaxChargeAccountIdByUser(String userId) {
|