From fd66dfefedf4db6a10e003153eed254b8e4dce5b Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 3 Aug 2017 13:01:39 +0800
Subject: [PATCH] update code

---
 .../web/service/impl/ReportServiceImpl.java        | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index ed7951a..1c03621 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -550,7 +550,36 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         Map<String, Object> titleMap = parseTitle(couponReport);
         transNullToZero(couponReport, titleMap);
 
-        return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", titleMap, "reportModel", reportModel);
+        /** titlemap 排序 */
+        Map<String, Object> temp = new LinkedHashMap<>();
+        Set<String> keys = titleMap.keySet();
+        for (String key : keys) {
+            if(key.startsWith("7")) {
+                temp.put(key, titleMap.get(key));
+            }
+        }
+        for (String key : keys) {
+            if(key.startsWith("9")) {
+                temp.put(key, titleMap.get(key));
+            }
+        }
+        for (String key : keys) {
+            if(key.startsWith("8")) {
+                temp.put(key, titleMap.get(key));
+            }
+        }
+        for (String key : keys) {
+            if(key.startsWith("10")) {
+                temp.put(key, titleMap.get(key));
+            }
+        }
+        for (String s : keys) {
+            if(!s.startsWith("10")||!s.startsWith("9")||!s.startsWith("8")||!s.startsWith("7")) {
+                temp.put(s, titleMap.get(s));
+            }
+        }
+
+        return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", temp, "reportModel", reportModel);
     }
 
     private void setZeroDataByTemp(List<String> key, List<Map<String, Object>> couponReport) {
-- 
1.8.3.1