From aa0161bf05195ccb00bc1d8da4b1b8218f93f4d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 16:14:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/DashboardController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 8701f21..60a7caf 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -40,6 +40,8 @@
     private BusinessTripOtherService businessTripOtherService;
     @Autowired
     private ReimburseOnlineService reimburseOnlineService;
+    @Autowired
+    private CompanyMoneyService companyMoneyService;
 
     //鑾峰彇鍥㈤槦鏁版嵁
     @RequestMapping(value = "/dashboard/companyData/auth")
@@ -141,6 +143,11 @@
         int planPriOnlinePendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("status", 1).eq("settle",4));
         map.put("planPriOnlinePendingTaskCount", planPriOnlinePendingTaskCount);
 
+        Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(getUserId(), year);
+        map.put("successMoney1", successMoney1==null? 0:successMoney1);
+
+        Double successMoney2 = companyMoneyService.selectMoneyActualReceiptsAll(getUserId(), year);
+        map.put("successMoney2", successMoney2==null? 0:successMoney2);
 
 
         return R.ok().add(map);

--
Gitblit v1.9.1