From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
index b8392ed..c23bea9 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java
@@ -7,6 +7,7 @@
import org.springframework.ui.Model;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -25,7 +26,7 @@
* @param createTime
* @return
*/
- EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime);
+ EntityWrapper<TAgent> getAgentWrapper(String principal, String principalPhone, String createTime,Integer status);
/**
* 代理商查看详情
@@ -41,5 +42,22 @@
* @param agentId
* @param model
*/
- void getDataStatistics(Integer agentId, Model model);
+ void getDataStatistics(Integer agentId, Model model, Map<String, Object> map);
+
+ /**
+ * 统计代理商
+ * @param ids
+ * @param model
+ * @param map
+ */
+ void getDataStatisticsByIds(List<Integer> ids, Model model, Map<String, Object> map);
+
+
+ /**
+ * 获取汇总数据
+ * @param id
+ * @param time
+ * @return
+ */
+ Map<String, Object> queryAgentSummaryData(Integer id, String time);
}
--
Gitblit v1.7.1