diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java index 4c0f342..770e5d0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ReviewReportImpl.java @@ -122,9 +122,7 @@ public class ReviewReportImpl implements ExportService { for (int i = 0; i < registerList.size(); i++) { Map map = new HashMap<>(16); - int num = i + 1; BizSupplierRegister register = registerList.get(i); - map.put("num", num); map.put("id", register.getCompanyId()); map.put("tbr", register.getCompanyName()); list3.add(map); @@ -165,7 +163,18 @@ public class ReviewReportImpl implements ExportService { String finalZbfs = zbfs; String finalPbwyhzz = pbwyhzz; List> sortList3 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("bj")))).collect(Collectors.toList()); - List> list4 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("zhdf")))).collect(Collectors.toList()); + for (int i = 0; i < sortList3.size(); i++) { + int num = i + 1; + sortList3.get(i).put("num", num); + } + List> list4 = list3.stream().sorted(Comparator.comparing(m -> { + Map m1 = (Map) m; + return String.valueOf(m1.get("zhdf")); + }).reversed()).collect(Collectors.toList()); + for (int i = 0; i < list4.size(); i++) { + int num = i + 1; + list4.get(i).put("num", num); + } Map all = new HashMap() {{ put("table1", list1); put("table2", list2);