From 0a3b28bcff870dfb742d76d06fc74481965ea122 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期四, 17 一月 2019 14:48:54 +0800 Subject: [PATCH] 用户自定义界面设置+ 免打扰IOS推送修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java index 0f22393..1d0294f 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java @@ -147,12 +147,14 @@ List<Map<String, Object>> result_list = null; + // 鐢ㄦ埛璁㈠崟 List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime, endTime); if (listTotal == null || listTotal.size() == 0) { return result_list; } + // 娣樺疂鑱旂洘 List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, startTime, endTime); -- Gitblit v1.8.0