From 5221d39b39762ecd5ea5501d43959a56af89780f Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 09 五月 2022 17:17:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/classes/NewAndEditLeadController.cls |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 6b353ac..326eb6e 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/force-app/main/default/classes/NewAndEditLeadController.cls
@@ -139,14 +139,51 @@
             if (mso.containsKey('LeadSource')) {
                 controller.getRecord().put('LeadSource', mso.get('LeadSource'));
             }
-            if (mso.containsKey('00N10000006qOFb')) {
-                controller.getRecord().put('StageName__c', mso.get('00N10000006qOFb'));
+            if (mso.containsKey(System.Label.Opportunity_stage)) {
+                controller.getRecord().put('Opportunity_stage__c', mso.get(System.Label.Opportunity_stage));
             }
-            if (mso.containsKey('00N10000006qOF0')) {
-                controller.getRecord().put('Close_Forecasted_Date__c', mso.get('00N10000006qOF0'));
+            //20220505 lt 娉ㄩ噴鎺�
+            // if (mso.containsKey('00N10000006qOF0')) {
+            //     controller.getRecord().put('Close_Forecasted_Date__c', Date.parse(mso.get('00N10000006qOF0')));
+            // }
+            if (mso.containsKey(System.Label.Opp_Name)) {
+                controller.getRecord().put('Opp_Name__c', mso.get(System.Label.Opp_Name));
+            }
+            // if (mso.containsKey('00N100000048UBf')) {
+            //     controller.getRecord().put('Contact__c', mso.get('00N100000048UBf'));
+            // }
+            if (mso.containsKey(System.Label.Purchase_Reason)) {
+                controller.getRecord().put('Purchase_Reason__c', mso.get(System.Label.Purchase_Reason));
+            }
+            if (mso.containsKey(System.Label.Fund_Basis)) {
+                controller.getRecord().put('Fund_Basis__c', mso.get(System.Label.Fund_Basis));
+            }
+            if (mso.containsKey(System.Label.Purchase_Type)) {
+                controller.getRecord().put('Purchase_Type__c', mso.get(System.Label.Purchase_Type));
+            }
+            //20220427 
+            if (mso.containsKey(System.Label.Tender_information)) { //鎷涙爣椤圭洰Id
+                controller.getRecord().put('Tender_information__c', mso.get(System.Label.Tender_information));
+            }
+            if (mso.containsKey(System.Label.Agency_Opportunity)) { //缁忛攢鍟嗚浠稩d
+                controller.getRecord().put('Agency_Opportunity__c', mso.get(System.Label.Agency_Opportunity));
+            }
+            if (mso.containsKey(System.Label.Sales_Method)) { //缁忛攢鍟嗚浠�--鎷涙爣鏂瑰紡
+                controller.getRecord().put('Sales_Method__c', mso.get(System.Label.Sales_Method));
+            }
+            if (mso.containsKey(System.Label.Request)) {
+                controller.getRecord().put('Request__c', mso.get(System.Label.Request));
+            }
+            if (mso.containsKey(System.Label.Request_Detail)) { 
+                controller.getRecord().put('Request_Detail__c', mso.get(System.Label.Request_Detail));
             }
             // 2022-04-13 鏉ユ簮 jz end 0414 lt
             rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
+            // 20220420 lt OBSAP start
+            if (String.isBlank(rtTypeId) && mso.containsKey('RecordTypeId')) {
+                rtTypeId = mso.get('RecordTypeId');
+            }
+            // 20220420 lt OBSAP end
             obj.put('OwnerId',UserInfo.getUserId());
         }
         LayoutDescriberHelper.LayoutWrapper LayoutWrapperValue = LayoutDescriberHelper.describeSectionWithFieldsWrapper(rtTypeId, 'Lead','classic');

--
Gitblit v1.9.1