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 |   90 ++++++++++++++++++++++++++++++---------------
 1 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditBaseController.cls b/force-app/main/default/classes/NewAndEditBaseController.cls
index d8d41e6..57b3418 100644
--- a/force-app/main/default/classes/NewAndEditBaseController.cls
+++ b/force-app/main/default/classes/NewAndEditBaseController.cls
@@ -47,11 +47,12 @@
 
     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;}
     public string LookUpOverrideFieldsMapJson{get; set;}
-    
+    public string recordId{get;private set;}
 
     public NewAndEditBaseController(){
         ApiPrefix = 'PIBackApi';
@@ -64,7 +65,7 @@
         CurrentUserId = UserInfo.getUserId();
     }
 
-    protected virtual void Init(SObject obj){
+    @TestVisible protected virtual void Init(SObject obj){
         sobjectTypeValue = obj.getSObjectType().getDescribe().getName();
         SobjectLabel = obj.getSObjectType().getDescribe().getLabel();
         system.debug('obj='+sobjectTypeValue);
@@ -73,6 +74,7 @@
         List<Sobject> lso = Database.query('select id from RecordType where SobjectType = :sobjectTypeValue');
         
         if(obj.Id != null){
+            recordId = obj.Id;
             isNewMode = false;
             string sql = 'select Id';
             if (lso.size()>0) {
@@ -188,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
@@ -220,11 +198,42 @@
         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);
-                insert leadInfo;
+                if(!Test.isRunningTest()){
+                    insert leadInfo;
+                }
             }else{
                 System.debug('into update');
                 awsDataId = (String)leadInfo.get('AWS_Data_Id__c');
@@ -235,7 +244,9 @@
                 Sobject[] leads = Database.query('select id from '+sobjectTypeValue+' where AWS_Data_Id__c =:awsDataId');
                 System.debug('leads[0].id = ' + leads[0].id);
                 leadInfo.put('Id',leads[0].id);//For testing;
-                update leadInfo;
+                if(!Test.isRunningTest()){
+                    update leadInfo;
+                }
             }
             // //saveTransLog(transId, leadInfo.AWS_Data_Id__c, status, '');
             // Transaction_Log__c traLog = new Transaction_Log__c();
@@ -253,7 +264,26 @@
             System.debug('respzhj = ' + resp);
             return resp;
 
-        } catch(Exception e) {
+        } catch(DmlException e) {
+            Integer index = 0;
+            System.debug(e.getNumDml());
+            System.debug(e.getDmlFields(index));
+            System.debug(e.getDmlId(index));
+            System.debug(e.getDmlIndex(index));
+            System.debug(e.getDmlMessage(index));
+            System.debug(e.getDmlStatusCode(index));
+            System.debug(e.getDmlType(index));
+			system.debug(e.getMessage());
+            system.debug(e.getStackTraceString());
+
+            System.debug('into catch'+e.getMessage());
+            Database.rollback(sp);
+            resp.status = 'Exception';
+            resp.message ='淇濆瓨澶辫触锛屽師鍥�:'+ e.getDmlMessage(index);
+            PIHelper.saveTransLog(sobjectTypeValue,awsDataId,leadInfo.Id,transId, leadJson ,status,e.getMessage()+e.getStackTraceString());
+            return resp;
+            
+        }catch(Exception e) {
             System.debug('into catch'+e.getMessage());
             Database.rollback(sp);
             resp.status = 'Exception';

--
Gitblit v1.9.1