From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/java/com/zy/crm/manager/service/OrderService.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/service/OrderService.java b/src/main/java/com/zy/crm/manager/service/OrderService.java
index f84ab81..9d2b150 100644
--- a/src/main/java/com/zy/crm/manager/service/OrderService.java
+++ b/src/main/java/com/zy/crm/manager/service/OrderService.java
@@ -4,12 +4,26 @@
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.crm.manager.entity.Order;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public interface OrderService extends IService<Order> {
 
     Order selectByUuid(Long hostId, String uuid);
 
     String getUuid(Long hostId);
 
-    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition);
+    Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId,Long director,  String condition, Integer status);
+
+    Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
+
+    Double selectMoneyByUserAndYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾鐢ㄦ埛銆佸勾浠藉拰璁㈠崟鐘舵�佹�讳氦鏄撻噾棰�
+
+    Integer selectCountByUserYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�绘暟閲�
+
+    List<Order> selectTopMoney();//鏌ヨ浜ゆ槗棰濆墠7鍚嶅憳宸�
+
+    List<Double> selectCurrentYearMonthSuccess();//鑾峰彇褰撳墠骞村害12涓湀鐨勪氦鏄撴垚鍔熼噾棰濇暟鎹�
 
 }

--
Gitblit v1.9.1