|
|
@@ -36,10 +36,7 @@ import java.math.RoundingMode;
|
|
|
import java.rmi.MarshalledObject;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.regex.Matcher;
|
|
|
@@ -767,6 +764,21 @@ public class ReportService {
|
|
|
// map.put("item", userArrearsItem);
|
|
|
map.put("arrears", total);
|
|
|
}
|
|
|
+ if(params.get("sort") != null) {
|
|
|
+ List<Map<String, Object>> processedArrears = arrears;
|
|
|
+ switch (String.valueOf(params.get("sort"))){
|
|
|
+ case "order":
|
|
|
+ arrears = arrears.stream()
|
|
|
+ .sorted(Comparator.comparingDouble((Map map) -> Double.valueOf(String.valueOf(map.get("arrears")))))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ break;
|
|
|
+ case "down":
|
|
|
+ arrears = arrears.stream()
|
|
|
+ .sorted(Comparator.comparingDouble((Map map) -> Double.valueOf(String.valueOf(map.get("arrears")))).reversed())
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (Integer.parseInt(params.get("currentPage").toString()) == 1) {
|
|
|
// 查询公司概况
|
|
|
// 获取销售额
|