From 3ba0123db48f8bab81ddf0913e1b95280ef545e8 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 17:56:53 +0800
Subject: [PATCH] Deploy0331
---
force-app/main/default/classes/NewAndEditLeadController.cls | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 45342a8..52944cd 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/force-app/main/default/classes/NewAndEditLeadController.cls
@@ -43,7 +43,9 @@
//鑾峰彇鎵�鏈夊瓧娈�
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Lead').getDescribe().fields.getMap().keyset());
// Add fields to controller. This is to avoid the SOQL error in visualforce page
- controller.addFields(fieldList);
+ if (!Test.isRunningTest()) {
+ controller.addFields(fieldList);
+ }
SObject obj = controller.getRecord();
if(ApexPages.currentPage().getParameters().get('CF00N1000000962np_lkid') != null){
@@ -90,7 +92,7 @@
contactDataId = c.AWS_Data_Id__c;
}
//鏌ヨ鎴樼暐绉戝鍒嗙被
- List<Contact> cs = [select Account.Department_Class__c from Contact where id='0030l00000mldeG'];
+ List<Contact> cs = [select Account.Department_Class__c from Contact where id=:contactId];
if(cs.size()>0){
controller.getRecord().put('Department_Class__c',cs[0].Account.Department_Class__c);
}
@@ -99,6 +101,20 @@
//鍖婚櫌鍚�
if(mso.containsKey('CF00N10000002CvC5_lkid')){
controller.getRecord().put('Hospital_Name__c',mso.get('CF00N10000002CvC5_lkid'));
+ //閫氳繃鍖婚櫌id鏌ヨ鎴樼暐绉戝鍒嗙被
+ String hospitalId = mso.get('CF00N10000002CvC5_lkid');
+ List<Account> hospitalAccount = [select Department_Class__c from Account where Id=:hospitalId];
+ if(hospitalAccount.size()>0){
+ List<Account> departmentAccount = [select Id from Account where Id=:hospitalAccount[0].Department_Class__c];
+ if (departmentAccount.size()>0) {
+ System.debug('Department_Class__c = ' + departmentAccount[0].Id);
+ controller.getRecord().put('Department_Class__c',departmentAccount[0].Id);
+ }
+ }
+ }
+ //鍏徃锛堢瀹わ級
+ if(mso.containsKey('CF00N10000002CvC5')){
+ controller.getRecord().put('Company',mso.get('CF00N10000002CvC5'));
}
//鎴樼暐绉戝CF00N10000006qNtt_lkid
// if(mso.containsKey('CF00N10000006qNtt_lkid ')){
@@ -139,6 +155,9 @@
//鑷畾涔夋牸寮忚浆鎹�
for (String fieldAPI: fieldValueMap.keySet()) {
system.debug('field API='+fieldAPI);
+ if(!fieldAPIToTypeMap.containskey(fieldAPI)){
+ continue;
+ }
Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();
String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI));
system.debug('Field Type:'+fielddataType+' field Value='+fieldValue);
@@ -152,7 +171,7 @@
leadInfo.put(fieldAPI, null);
}
}else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
- leadInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?0:Decimal.valueOf(fieldValue));
+ leadInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', '')));
} else if(String.valueof(fielddataType)=='BOOLEAN'){
leadInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
}else {
@@ -197,4 +216,46 @@
return resp;
}
}
+
+ @RemoteAction
+ global static String queryAccount(String accountTypes,String accountId) {
+ System.debug('accountType='+accountTypes);
+ System.debug('accountId='+accountId);
+ List<Object> types = (List<Object>)JSON.deserializeUntyped(accountTypes);
+ System.debug('types='+types);
+ String soql = 'select Id,Name,';
+ for (Object t : types) {
+ soql += (String)t+',';
+ }
+ soql = soql.substring(0,soql.length()-1);
+ soql += ' from Account where id=\''+accountId+'\'';
+ System.debug('soql='+soql);
+ Sobject account = Database.query(soql);
+
+ Map<String, Map<String, String>> m = new Map<String, Map<String, String>>();
+
+ System.debug('account='+account);
+ for (Object ty : types) {
+ String t = (String)ty;
+ if (account.get(t) != null){
+ Sobject acc = Database.query('select Id,Name from Account where id=\''+account.get(t)+'\'');
+ Map<String, String> n = new Map<String, String>();
+ n.put('Id', (String)acc.get('Id'));
+ n.put('Name', (String)acc.get('Name'));
+ m.put(t, n);
+ }
+ }
+ // if (account.get('Hospital__c') != null){
+ // m.put('Hospital__c', (String)account.get('Hospital__c'));
+ // m.put('Hospital__r.Name', (String)account.get('Hospital__r.Name'));
+ // }
+ // if (account.get('Department_Class__c') != null){
+ // m.put('Department_Class__c', (String)account.get('Department_Class__c'));
+ // m.put('Department_Class__r.Name', (String)account.get('Department_Class__r.Name'));
+ // }
+ System.debug('m='+m);
+ return JSON.serialize(m);
+
+ // return (String)account.get('Hospital__c');
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1