From 470ae430433a79c68e115fdc94fc16291f034749 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 14:01:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/DashboardController.java |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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 09e9207..f34603e 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -5,10 +5,8 @@
 import com.core.common.Cools;
 import com.core.common.R;
 import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.CompanyTarget;
-import com.zy.crm.manager.entity.Order;
-import com.zy.crm.manager.service.CompanyTargetService;
-import com.zy.crm.manager.service.OrderService;
+import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.service.*;
 import com.zy.crm.system.entity.Role;
 import com.zy.crm.system.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,20 @@
     private CompanyTargetService companyTargetService;
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private PlanService planService;
+    @Autowired
+    private PriOnline2Service priOnline2Service;
+    @Autowired
+    private PriQuoteService priQuoteService;
+    @Autowired
+    private BusinessTripService businessTripService;
+    @Autowired
+    private BusinessTripOtherService businessTripOtherService;
+    @Autowired
+    private ReimburseOnlineService reimburseOnlineService;
+    @Autowired
+    private CompanyMoneyService companyMoneyService;
 
     //鑾峰彇鍥㈤槦鏁版嵁
     @RequestMapping(value = "/dashboard/companyData/auth")
@@ -60,9 +72,15 @@
 //        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
         double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 100;
 
+        Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(null, year);
+
+        Double successMoney2 = companyMoneyService.selectMoneyActualReceiptsAll(null, year);
+
         map.put("successMoney", formatter.format(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
         map.put("progressMoney", formatter.format(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
         map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//鍏ㄥ勾浜ゆ槗鐜�
+        map.put("receivablesMoney", successMoney1/10000);//搴旀敹娆�
+        map.put("actualReceiptsMoney",successMoney2/10000);//瀹為檯鏀舵
         return R.ok().add(map);
     }
 
@@ -107,6 +125,36 @@
         Integer successCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 1);
         map.put("progressCount", progressCount);
         map.put("successCount", successCount);
+
+//        planPendingTaskCount
+//        priOnlinePendingTaskCount
+//        priQuotePendingTaskCount
+//        businessTripPendingTaskCount
+//        reimburseOnlinePendingTaskCount
+//        planPriOnlinePendingTaskCount
+
+        //鑾峰彇寰呭鐞嗕换鍔℃暟閲�
+        int planPendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("director", getUserId()).lt("settle",4));
+        map.put("planPendingTaskCount", planPendingTaskCount);
+        int priOnlinePendingTaskCount = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("member_id", getUserId()).lt("settle",2));
+        map.put("priOnlinePendingTaskCount", priOnlinePendingTaskCount);
+        int priQuotePendingTaskCount = priQuoteService.selectCount(new EntityWrapper<PriQuote>().eq("member_id", getUserId()).lt("settle",4));
+        map.put("priQuotePendingTaskCount", priQuotePendingTaskCount);
+        int businessTripCount = businessTripService.selectCount(new EntityWrapper<BusinessTrip>().eq("member_id", getUserId()).lt("settle", 2));
+        int businessTripOtherCount = businessTripOtherService.selectCount(new EntityWrapper<BusinessTripOther>().eq("member_id", getUserId()).lt("settle",2));
+        int businessTripPendingTaskCount = businessTripCount+businessTripOtherCount;
+        map.put("businessTripPendingTaskCount", businessTripPendingTaskCount);
+        int reimburseOnlinePendingTaskCount = reimburseOnlineService.selectCount(new EntityWrapper<ReimburseOnline>().eq("member_id", getUserId()).lt("settle",6));
+        map.put("reimburseOnlinePendingTaskCount", reimburseOnlinePendingTaskCount);
+        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);
     }
@@ -161,12 +209,18 @@
         if (Cools.isEmpty(token)){
             return R.ok(item);
         }
-        User user = getUser(token);
-        if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
-            return R.ok(item);
-        }
-        if (user.getRoleId()<3){
-            item="true";
+        try{
+            User user = getUser(token);
+            if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
+                return R.ok(item);
+            }
+            if (user.getRoleId()<2){
+                item="true";
+            }else if (user.getRoleId()<3){
+                item="true2";
+            }
+        }catch (Exception e){
+
         }
         return R.ok(item);
     }

--
Gitblit v1.9.1