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 titleMap = parseTitle(couponReport); transNullToZero(couponReport, titleMap); - return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", titleMap, "reportModel", reportModel); + /** titlemap 排序 */ + 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)); + } + } + + return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", temp, "reportModel", reportModel); } private void setZeroDataByTemp(List key, List> couponReport) {