From a48ed9f335db52a433a2b343ff9636a28ee8a97f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 10 三月 2022 18:53:59 +0800
Subject: [PATCH] New xml file for PIPL20220310

---
 force-app/main/default/classes/NFM624Rest.cls |   98 +++++++++++++++++++++++++++----------------------
 1 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 254feb4..ad8dc2e 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -473,7 +473,7 @@
                         //2022/2/10 淇敼 鍦ㄦ柊寤鸿仈绯讳汉涔嬪悗鎵嬪姩鎵цNFM620RestBatch NFM623RestBatch
                         // Database.executeBatch(new NFM620RestBatch(), 1);
                         // Database.executeBatch(new NFM623RestBatch(), 1);
-                        // supplement(gedata.ContactId);
+                        supplement(gedata.ContactId);
                     }
                 }
             }
@@ -612,61 +612,71 @@
         //鎶�620Batch 鍜� 623Batch 鎼繃鏉�
         //琛ュ厖璇㈤棶鍗曢儴鍒� start
         //鏇存柊鐢�
+        List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
         List<Inquiry_form__c> inquiryFormList = new List<Inquiry_form__c>();
         //鏍规嵁缁熶竴鐢ㄦ埛Id鏌ヨ璇㈤棶鍗�
         List<Inquiry_form__c> InquiryList = [select Id,Inquiry_No__c,ContactId__c,Hospital_Name__c,Department_Class__c,Contact_Name__c from Inquiry_form__c where ContactId__c = :ContactId];
         system.debug('InquiryList'+InquiryList);
         //鏍规嵁缁熶竴鐢ㄦ埛Id鏌ヨ鑱旂郴浜�
+        //select Id,Name,UnifiedI_Contact_ID__c,AccountId,Account.Name from Contact
         List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId from Contact where UnifiedI_Contact_ID__c = :ContactId];
-        system.debug('contactList' + contactList);
-        //缁熶竴鐢ㄦ埛ID瀛樺叆List銆佽闂崟ID瀛楳ap
-        Map<String, String> inquiryMap = new Map<String, String>();
-        //List<String> contactIdList = new List<String>();
-        for (Inquiry_form__c inquiryInfo : inquiryList) {
-            //contactIdList.add(inquiryInfo.ContactId__c);
-            inquiryMap.put(inquiryInfo.ContactId__c, inquiryInfo.Id);
-        }
-        if (contactList.size() >0 ) {
-            for (Contact contactInfo : contactList) {
-                Inquiry_form__c inquiry = new Inquiry_form__c();
-                inquiry.Id = inquiryMap.get(contactInfo.UnifiedI_Contact_ID__c);      //ID
-                inquiry.Hospital_Name__c = contactInfo.Account.Id;                    //绉戝鍚�   
-                inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c;    //鎴樼暐绉戝鍒嗙被
-                inquiry.Contact_Name__c = contactInfo.Id;                             //瀹㈡埛濮撳悕
-                inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId;        //鎵�鏈変汉
-                inquiryFormList.add(inquiry);
+        system.debug('contactList' + contactList);  
+        
+        if(InquiryList.size()>0){
+             //缁熶竴鐢ㄦ埛ID瀛樺叆List銆佽闂崟ID瀛楳ap
+            Map<String, String> inquiryMap = new Map<String, String>();
+            //List<String> contactIdList = new List<String>();
+            for (Inquiry_form__c inquiryInfo : inquiryList) {
+                //contactIdList.add(inquiryInfo.ContactId__c);
+                inquiryMap.put(inquiryInfo.ContactId__c, inquiryInfo.Id);
             }
-        }
-        if(inquiryFormList.size()>0){
-            update inquiryFormList;
+            if (contactList.size() >0 ) {
+                for (Contact contactInfo : contactList) {
+                    Inquiry_form__c inquiry = new Inquiry_form__c();
+                    inquiry.Id = inquiryMap.get(contactInfo.UnifiedI_Contact_ID__c);      //ID
+                    inquiry.Hospital_Name__c = contactInfo.Account.Id;                    //绉戝鍚�   
+                    inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c;    //鎴樼暐绉戝鍒嗙被
+                    inquiry.Contact_Name__c = contactInfo.Id;                             //瀹㈡埛濮撳悕
+                    inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId;        //鎵�鏈変汉
+                    inquiryFormList.add(inquiry);
+                }
+            }
+            system.debug('inquiryFormList=========>'+inquiryFormList);
+            if(inquiryFormList.size()>0){
+                update inquiryFormList;
+            }
         }
         //琛ュ厖璇㈤棶鍗曢儴鍒� end
         
         //琛ュ厖瀛︿細閮ㄥ垎 start
-        List<CampaignMember__c> campaignMemberList = new List<CampaignMember__c>();
-        List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where Contact_ID__c = :ContactId];
-        Map<String, String> capMemMap = new Map<String, String>(); 
-        //缁熶竴鐢ㄦ埛ID瀛樺叆List,鍙備細浜哄憳璁板綍ID瀛樺叆MAP
-        //List<String> contactIdList = new List<String>();
-        for (CampaignMember__c capMemInfo : capMemList) {
-            //contactIdList.add(capMemInfo.ViewContactId__c);
-            capMemMap.put(capMemInfo.ViewContactId__c,capMemInfo.Id);
-        }
-        //List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId,Id from Contact where UnifiedI_Contact_ID__c = ContactId];
-        if (contactList.size() > 0) {
-            for (Contact contactInfo : contactList) {
-                CampaignMember__c camMemberInfo = new CampaignMember__c();
-                camMemberInfo.Id = capMemMap.get(contactInfo.UnifiedI_Contact_ID__c);
-                camMemberInfo.Contact_ID__c = contactInfo.ID;                   //鍙備細浜哄憳ID
-                camMemberInfo.Department_ID__c = contactInfo.AccountId;         //鍖婚櫌绉戝
-                camMemberInfo.Department__c = contactInfo.Account.Name;         //鍖婚櫌绉戝锛堟枃鏈級
-                camMemberInfo.Contact__c = contactInfo.Name;                    //瀹㈡埛浜哄憳濮撳悕
-                campaignMemberList.add(camMemberInfo);
+        List<CampaignMember__c> capMemList = [select Id,Contact_ID__c,Campaign__c,Campaign__r.Num__c,ViewContactId__c from CampaignMember__c where ViewContactId__c = :ContactId];
+        if(capMemList.size() > 0){
+            system.debug('capMemList=================>'+capMemList);
+            Map<String, String> capMemMap = new Map<String, String>(); 
+            //缁熶竴鐢ㄦ埛ID瀛樺叆List,鍙備細浜哄憳璁板綍ID瀛樺叆MAP
+            //List<String> contactIdList = new List<String>();
+            for (CampaignMember__c capMemInfo : capMemList) {
+                //contactIdList.add(capMemInfo.ViewContactId__c);
+                capMemMap.put(capMemInfo.ViewContactId__c,capMemInfo.Id);
             }
-            
-        }
-        if (campaignMemberList.size() > 0) {
-            update campaignMemberList;
+            system.debug('capMemMap======>'+capMemMap);
+            //List<Contact> contactList = [select Id,Name,UnifiedI_Contact_ID__c,Account.Id,Strategic_dept_Class__c,AccountId,Account.Name,Strategic_dept_Class__r.OwnerId,Id from Contact where UnifiedI_Contact_ID__c = ContactId];
+            if (contactList.size() > 0) {
+                for (Contact contactInfo : contactList) {
+                    CampaignMember__c camMemberInfo = new CampaignMember__c();
+                    camMemberInfo.Id = capMemMap.get(contactInfo.UnifiedI_Contact_ID__c);
+                    camMemberInfo.Contact_ID__c = contactInfo.Id;                   //鍙備細浜哄憳ID
+                    camMemberInfo.Department_ID__c = contactInfo.AccountId;         //鍖婚櫌绉戝
+                    camMemberInfo.Department__c = contactInfo.Account.Name;         //鍖婚櫌绉戝锛堟枃鏈級
+                    camMemberInfo.Contact__c = contactInfo.Name;                    //瀹㈡埛浜哄憳濮撳悕
+                    campaignMemberList.add(camMemberInfo);
+                }
+            }
+            system.debug('campaignMemberList================>'+campaignMemberList);
+            if (campaignMemberList.size() > 0) {
+                System.debug('--------1-------');
+                update campaignMemberList;
+            }
         }
         //琛ュ厖瀛︿細閮ㄥ垎 end
     }

--
Gitblit v1.9.1