From cc8faead523007deca7e0bded6967e8fc1f4c6bb Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 27 四月 2022 14:24:19 +0800
Subject: [PATCH] Commit controller lead
---
force-app/main/default/classes/StartTradingController.cls | 13 +++++--------
force-app/main/default/classes/NewAndEditLeadController.cls | 34 +---------------------------------
2 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 8ac45c3..6ff38fd 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/force-app/main/default/classes/NewAndEditLeadController.cls
@@ -65,7 +65,7 @@
ifc = [select Id,AWS_Data_Id__c,Contact_Name__c,Contact_Id__c,Hospital_Name__c,Hospital_ID__c,Department_Class__c,
Department_ID__c,Opp_Name_Search__c,Opp_Name_Search_ID__c,Campaign__c,
Campaign_ID__c,Name,Cancel_Reason__c,Phone__c,Email__c,Last_Name__c,LeadSource__c,Opportunity_Division__c,Request1__c,
- Urgent__c,Inquiry_Num__c from Inquiry_form__c where id = :InquiryFormId];
+ Urgent__c from Inquiry_form__c where id = :InquiryFormId];
System.debug('ifc = ' + ifc);
if(ifc.Contact_Id__c !=null && ifc.Contact_Id__c != ''){
Contact c = [select AWS_Data_Id__c from Contact where id = :ifc.Contact_Id__c];
@@ -75,7 +75,6 @@
System.debug('ifc = ' + ifc);
rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
obj.put('OwnerId',UserInfo.getUserId());
- obj.put('Inquiry_Num__c',ifc.Inquiry_Num__c);// 20220413 SWAG-CBUB2W you
}else if(obj.Id != null){
//鏇存柊
isNewMode = false;
@@ -135,38 +134,7 @@
// if(mso.containsKey('CF00N10000006qNtt_lkid ')){
// controller.getRecord().put('Department_Class__c',mso.get('CF00N10000006qNtt_lkid '));
// }
- // 2022-04-13 鏉ユ簮 jz start 0414 lt
- if (mso.containsKey('LeadSource')) {
- controller.getRecord().put('LeadSource', mso.get('LeadSource'));
- }
- if (mso.containsKey('00N10000006qOFb')) {
- controller.getRecord().put('Opportunity_stage__c', mso.get('00N10000006qOFb'));
- }
- if (mso.containsKey('00N10000006qOF0')) {
- controller.getRecord().put('Close_Forecasted_Date__c', Date.parse(mso.get('00N10000006qOF0')));
- }
- if (mso.containsKey('00N10000002EjE1')) {
- controller.getRecord().put('Opp_Name__c', mso.get('00N10000002EjE1'));
- }
- // if (mso.containsKey('00N100000048UBf')) {
- // controller.getRecord().put('Contact__c', mso.get('00N100000048UBf'));
- // }
- if (mso.containsKey('00N10000002Cl6Y')) {
- controller.getRecord().put('Purchase_Reason__c', mso.get('00N10000002Cl6Y'));
- }
- if (mso.containsKey('00N10000002CpEz')) {
- controller.getRecord().put('Fund_Basis__c', mso.get('00N10000002CpEz'));
- }
- if (mso.containsKey('00N10000002CpF9')) {
- controller.getRecord().put('Purchase_Type__c', mso.get('00N10000002CpF9'));
- }
- // 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');
diff --git a/force-app/main/default/classes/StartTradingController.cls b/force-app/main/default/classes/StartTradingController.cls
index fc903e1..4579d0c 100644
--- a/force-app/main/default/classes/StartTradingController.cls
+++ b/force-app/main/default/classes/StartTradingController.cls
@@ -77,9 +77,11 @@
// 銉兗銉夋儏鍫便倰鍙栧緱
this.lead = [select id,SI_OppoLeadSec__c,owner_not_automatically_update__c, Hospital_Name__c, Contact_Name__c, Contact_Name__r.Name,
Opportunity_stage__c,Hospital_Name__r.RecordType.DeveloperName, Hospital_Name__r.Parent.RecordType.DeveloperName,
- LastName, FirstName, LeadSource, Other_Society__c, Opp_Name__c, Purchase_Reason__c, Trade__c, Sales_Root__c, Campaign__c,
+ LastName, FirstName, LeadSource, Other_Society__c, Opp_Name__c, Purchase_Reason__c, Trade__c, Sales_Root__c,
Close_Forecasted_Date__c, Competitor__c, Hospital_Budget__c, Promise_Class__c, Dicision_Maker__c, Purchase_Type__c,
- Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,Inquiry_Num__c,CreatedDate,CreatedById
+ Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,
+ // Inquiry_Num__c,
+ CreatedDate,CreatedById
from Lead where id =: this.leadId];
// 瑷虹檪绉戦伕鎶炪儶銈广儓銇彇寰楋紙鏉′欢锛氱梾闄�=銉兗銉夋儏鍫便伄鐥呴櫌鍚嶇О锛�
@@ -289,7 +291,7 @@
opp.Name = '*';
}
//20220412 SWAG-CBUB2W you start
- opp.Inquiry_Num__c = this.lead.Inquiry_Num__c;
+ // opp.Inquiry_Num__c = this.lead.Inquiry_Num__c;
//20220412 SWAG-CBUB2W you end
opp.From_Lead_TF__c = true;
opp.Trade__c = (String.isBlank(this.lead.Trade__c)) ? '鍐呰部' : this.lead.Trade__c;
@@ -380,11 +382,6 @@
System.debug('opp.Sales_Method__c:'+opp.Sales_Method__c);
System.debug('opp.Fund_Basis__c:'+opp.Fund_Basis__c);
System.debug('opp.SAP_Province__c:'+opp.SAP_Province__c);
-
- // 2022-04-15 OBSAP鏂板淇敼 start
- opp.CampaignId = this.lead.Campaign__c;
- System.debug('opp.CampaignId:'+opp.CampaignId);
- // 2022-04-15 OBSAP鏂板淇敼 end
update opp;
return null;
}
--
Gitblit v1.9.1