From 6ae13e443369feb7bf321a804f74c49e29d78551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com>
Date: Thu, 13 Jan 2022 11:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/service/impl/ReviewReportImpl.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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<String, Object> 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<Map<String, Object>> sortList3 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("bj")))).collect(Collectors.toList());
-        List<Map<String, Object>> 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<Map<String, Object>> list4 = list3.stream().sorted(Comparator.comparing(m -> {
+            Map<String, Object> m1 = (Map<String, Object>) 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<String, Object> all = new HashMap<String, Object>() {{
             put("table1", list1);
             put("table2", list2);