From 3b2d7d1327b53ea6a641ae947f3062b1dd1dcd70 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 14:21:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/controller/DashboardController.java |   36 ++++++++++++++++++++++++++++--------
 src/main/webapp/views/home/dashboard.html                            |    8 +-------
 2 files changed, 29 insertions(+), 15 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 f34603e..461575d 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -24,6 +24,8 @@
 @RestController
 public class DashboardController extends BaseController {
 
+    Integer PBN = 6;
+
     @Autowired
     private CompanyTargetService companyTargetService;
     @Autowired
@@ -42,6 +44,10 @@
     private ReimburseOnlineService reimburseOnlineService;
     @Autowired
     private CompanyMoneyService companyMoneyService;
+    @Autowired
+    private ProcessPermissionsService processPermissionsService;
+    @Autowired
+    private PlanTypeService planTypeService;
 
     //鑾峰彇鍥㈤槦鏁版嵁
     @RequestMapping(value = "/dashboard/companyData/auth")
@@ -126,13 +132,6 @@
         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);
@@ -146,7 +145,28 @@
         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));
+        int planPriOnlinePendingTaskCount = 0;
+        List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 4).or().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
+        int type =0;
+        for (ProcessPermissions processPermissions:processPermissionsList){
+            if (getUserId().equals(processPermissions.getUserId())){
+                type=PBN-processPermissions.getProcessMemo();
+                break;
+            }
+        }
+        if (type!=0){
+            EntityWrapper<Plan> wrapper = new EntityWrapper<>();
+            wrapper.eq("status",1);
+            wrapper.eq("assistant_host_sign",0);
+            List<Long> typeList = new ArrayList<>();
+            List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
+            for (PlanType planType : planTypes){
+                typeList.add(planType.getId());
+            }
+            wrapper.in("plan_type",typeList);
+            List<Plan> plans = planService.selectList(wrapper);
+            planPriOnlinePendingTaskCount=plans.size();
+        }
         map.put("planPriOnlinePendingTaskCount", planPriOnlinePendingTaskCount);
 
         Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(getUserId(), year);
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 0e82d16..e72ea60 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -88,7 +88,7 @@
                             <div class="numberInfoSubTitle testColorBlack">鍙帴鏀舵牳浠蜂换鍔�</div>
                             <div class="numberInfoValue">
 <!--                                <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em></a>-->
-                                <span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em>
+                                <span id="planPriOnlinePendingTaskCount">0</span><em class="numberInfoSuffix">涓�</em>
                             </div>
                         </div>
                     </div>
@@ -534,17 +534,11 @@
                 $("#successMoney").text(res.data.successMoney)
                 $("#successMoneyTwo").text(res.data.successMoney)
                 $("#planPendingTaskCount").text(res.data.planPendingTaskCount)
-                $("#planPendingTaskCountTwo").text(res.data.planPendingTaskCount)
                 $("#priOnlinePendingTaskCount").text(res.data.priOnlinePendingTaskCount)
-                $("#priOnlinePendingTaskCountTwo").text(res.data.priOnlinePendingTaskCount)
                 $("#priQuotePendingTaskCount").text(res.data.priQuotePendingTaskCount)
-                $("#priQuotePendingTaskCountTwo").text(res.data.priQuotePendingTaskCount)
                 $("#businessTripPendingTaskCount").text(res.data.businessTripPendingTaskCount)
-                $("#businessTripPendingTaskCountTwo").text(res.data.businessTripPendingTaskCount)
                 $("#reimburseOnlinePendingTaskCount").text(res.data.reimburseOnlinePendingTaskCount)
-                $("#reimburseOnlinePendingTaskCountTwo").text(res.data.reimburseOnlinePendingTaskCount)
                 $("#planPriOnlinePendingTaskCount").text(res.data.planPriOnlinePendingTaskCount)
-                $("#planPriOnlinePendingTaskCountTwo").text(res.data.planPriOnlinePendingTaskCount)
                 $("#successMoney1").text(res.data.successMoney1)
                 $("#successMoney1Two").text(res.data.successMoney1)
                 $("#successMoney2").text(res.data.successMoney2)

--
Gitblit v1.9.1