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 de1f71c..ed7951a 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 @@ -699,7 +699,36 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService coupon.put(s, 0); } } + } + Map temp = new LinkedHashMap<>(); + Set 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)); + } + } + titleMap.clear(); + titleMap.putAll(temp); }