From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/classes/taskAlertController.cls |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/taskAlertController.cls b/force-app/main/default/classes/taskAlertController.cls
index 60e0c06..c040ae2 100644
--- a/force-app/main/default/classes/taskAlertController.cls
+++ b/force-app/main/default/classes/taskAlertController.cls
@@ -5,6 +5,9 @@
     public Integer UnfinishedTaskNumber { get; set; } 
     public Integer opportunityTasksNumber {get; set;}
     public Integer opplostTasksNumber {get; set;}
+    public Integer subOpportunityTasksNumber {get; set;}
+    public Integer subopplostTasksNumber {get; set;}
+
     //2021-05-19 鎷涙姇鏍囬」鐩�--椤甸潰鎻愰啋  mzy  start
     public Integer myTBCNumber { get; set; }
     public Integer myTBRNumber { get; set; }
@@ -34,7 +37,11 @@
     public Boolean isShowTask{get;set;}
     public String proId{get;set;}
 
+    
+    public Boolean Is2M4{get;set;} // 20221213 ljh SWAG-CK28WT
+
     public taskAlertController() {
+        Is2M4 = false;
     }
     public PageReference init() {
         //2022-3-17 yjk 鏍规嵁绠�妗f樉绀轰换鍔℃彁閱�
@@ -44,6 +51,12 @@
         }else{
             isShowTask = true;
         }
+        // 20221013 ljh SWAG-CK28WT start
+        String p_2M4 = System.Label.ProfileId_2M4;
+        if(proId.substring(0,15) == p_2M4.substring(0,15)){
+            Is2M4 = true;
+        }
+        // 20221013 ljh SWAG-CK28WT end
         Date today = Date.today();
         Date firstDate = Date.newInstance(today.year(), today.month(), 1);
 
@@ -63,11 +76,16 @@
         //20220624 sx 璇环璺熻繘浠诲姟   澶卞崟鎶ュ憡浠诲姟 聽taskDifferent__c '琚姩浠诲姟' 聽 聽taskStatus__c 聽'02 鎺ュ彈'
 		taskManageController.Task opportunityTasks = 
 		taskManageController.getCurrentTask(null,'涓爣缁撴灉纭', '02 鎺ュ彈' , null, null, null, null, 
-		 									null, null, null, null, null, null, null, null);
+		 									null, '涓爣缁撴灉纭', null, '02 鎺ュ彈', null, null, null, null);
 
         taskManageController.Task opplostTasks = 
         taskManageController.getCurrentTask(null,'澶卞崟鎶ュ憡浠诲姟', '02 鎺ュ彈' , null, null, null, null, 
-                                            null, null, null, null, null, null, null, null);
+                                            null, '澶卞崟鎶ュ憡浠诲姟', null, '02 鎺ュ彈', null, null, null, null);
+
+
+        system.debug('==========subTask=======' + opplostTasks.subTasks);
+        system.debug('==========subTask=======' + opportunityTasks.subTasks);
+
         system.debug('====================opplostTasks:' + opplostTasks.myTasks.size());                 
         system.debug('opportunityTasks' + opportunityTasks.myTasks.size());
 		//20220624 sx 璇环璺熻繘浠诲姟end
@@ -82,6 +100,8 @@
         //20220624 sx 璇环璺熻繘浠诲姟 聽taskDifferent__c '琚姩浠诲姟' 聽 聽taskStatus__c 聽'02 鎺ュ彈'
         opportunityTasksNumber = opportunityTasks.myTasks == null ? 0 : opportunityTasks.myTasks.size();
         opplostTasksNumber = opplostTasks.myTasks == null ? 0 : opplostTasks.myTasks.size();
+        subOpportunityTasksNumber = opportunityTasks.subTasks == null ? 0 : opportunityTasks.subTasks.size();
+        subopplostTasksNumber = opplostTasks.subTasks == null ? 0 : opplostTasks.subTasks.size();
         //20220624 sx 璇环璺熻繘浠诲姟end
 
         // taskManageController.Task  myallTask =
@@ -142,7 +162,7 @@
         profileIdList.add(System.Label.ProfileId_2S6);
         profileIdList.add(System.Label.ProfileId_2S8);
         profileIdList.add(System.Label.ProfileId_2S10);
-
+        
         if( profileIdList.contains(UserInfo.getProfileId())){
             //2022-4-22 yjk 淇敼鏌ヨ閫昏緫
             List<Inquiry_form__c> InquiryNumberFSEList = [select id from Inquiry_form__c where Service_Status__c = '01.鏈窡杩�' and     FSE_Owner__c =:UserInfo.getUserId()];

--
Gitblit v1.9.1