From f5a94e721ae5a26f817f0df75065b64f1f192eb3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 28 三月 2022 21:43:51 +0800
Subject: [PATCH] PIPLFunctionDeploy0328

---
 force-app/main/default/classes/NewAndEditBaseController.cls |   56 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditBaseController.cls b/force-app/main/default/classes/NewAndEditBaseController.cls
index 53b2e3c..57b3418 100644
--- a/force-app/main/default/classes/NewAndEditBaseController.cls
+++ b/force-app/main/default/classes/NewAndEditBaseController.cls
@@ -47,6 +47,7 @@
 
     public String sobjectPrefix{get;private set;}
     public String SaveAndNewButtonUrl{get;private set;}
+    @TestVisible
     public List<String> VLookUpFields{get;private set;}
     public String VLookUpFieldsJson{get{return Json.serialize(VLookUpFields);}}
     public List<String> LookUpOverrideFields{get;private set;}
@@ -189,31 +190,7 @@
         Schema.SObjectType leadSchema = schemaMap.get(sobjectTypeValue);
         Map<String, Schema.SObjectField> fieldAPIToTypeMap = leadSchema.getDescribe().fields.getMap();
         Map<String,Object> fieldValueMap = (Map<String,Object>)JSON.deserializeUntyped(leadJson);
-        Sobject leadInfo = sobj;
-        for (String fieldAPI: fieldValueMap.keySet()) {
-            system.debug('field API='+fieldAPI);
-            Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();  
-            String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI)); 
-            system.debug('Field Type:'+fielddataType+' field Value='+fieldValue);
-            if(String.valueOf(fielddataType)=='DATE'){
-                leadInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-')));              
-            }else if(String.valueOf(fielddataType)=='DATETIME'){
-                if(String.isNotBlank(fieldValue)&&fieldValue.contains('T')){
-                    fieldValue = fieldValue.replace('T',' ');
-                    leadInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
-                }else{
-                    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)); 
-            } else if(String.valueof(fielddataType)=='BOOLEAN'){
-                leadInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
-            }else {
-                leadInfo.put(fieldAPI,fieldValue);
-            }                  
-        }
-
-        system.debug('for (String fieldAPI: fieldValueMap.keySet()) end');
+        
 
         
         //2. Save Record Process
@@ -221,8 +198,37 @@
         Response resp = new Response();
         String awsDataId = '';
         Savepoint sp = Database.setSavepoint();
+        Sobject leadInfo = sobj;
         try{
             System.debug('abcde');
+            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);
+                if(String.valueOf(fielddataType)=='DATE'){
+                    leadInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-')));              
+                }else if(String.valueOf(fielddataType)=='DATETIME'){
+                    if(String.isNotBlank(fieldValue)&&fieldValue.contains('T')){
+                        fieldValue = fieldValue.replace('T',' ');
+                        leadInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
+                    }else{
+                        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))?null:Decimal.valueOf(fieldValue.replace(',', ''))); 
+                } else if(String.valueof(fielddataType)=='BOOLEAN'){
+                    leadInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
+                }else {
+                    leadInfo.put(fieldAPI,fieldValue);
+                }                  
+            }
+
+            system.debug('for (String fieldAPI: fieldValueMap.keySet()) end');
+            
             if(isNew){
                 System.debug('leadInfozhj = ' + leadInfo);
                 if(!Test.isRunningTest()){

--
Gitblit v1.9.1