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/ITDriverService.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
index c073086..4d9b576 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -8,7 +8,9 @@
import com.baomidou.mybatisplus.service.IService;
import org.springframework.ui.Model;
+import java.io.File;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -45,10 +47,10 @@
/**
* 聚合ocr识别
- * @param imgUrl
+ * @param file
* @return
*/
- JSONObject ocr(String imgUrl);
+ JSONObject ocr(File file);
/**
* 新增修改处理数据
@@ -77,12 +79,29 @@
* @param tDriverId
* @param model
*/
- void driverCommissionDetail(Integer tDriverId, Model model);
+ void driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model);
/**
* 统计司机数
* @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 driverId
+ * @param time
+ * @return
+ */
+ Map<String, Object> querySummaryData(Integer driverId, String time);
}
--
Gitblit v1.7.1