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/RentalApplyController.cls |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/force-app/main/default/classes/RentalApplyController.cls b/force-app/main/default/classes/RentalApplyController.cls
index f9b442d..e38bb9f 100644
--- a/force-app/main/default/classes/RentalApplyController.cls
+++ b/force-app/main/default/classes/RentalApplyController.cls
@@ -2,7 +2,7 @@
  * @description       : 
  * @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  * @group             : 
- * @last modified on  : 03-23-2022
+ * @last modified on  : 03-28-2022
  * @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
 **/
 global without sharing class RentalApplyController {
@@ -30,7 +30,9 @@
         PIPL_Input_Account_Error_Msg = label.PIPL_Input_Account_Error_Msg;
         //鑾峰彇鎵�鏈夊瓧娈�
         List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Rental_Apply__c').getDescribe().fields.getMap().keyset());  
-        controller.addFields(fieldList);
+        if(!Test.isRunningTest()){
+            controller.addFields(fieldList);
+        }
         SObject obj = controller.getRecord();        
         if(obj.Id != null){
             //鏇存柊
@@ -106,24 +108,28 @@
         Rental_Apply__c rentalApplyInfo = new Rental_Apply__c();
         //鑷畾涔夋牸寮忚浆鎹�
         for (String fieldAPI: fieldValueMap.keySet()) {
-            Schema.DisplayType fielddataType = fieldAPIToTypeMap.get(fieldAPI).getDescribe().getType();  
-            String fieldValue = String.valueOf(fieldValueMap.get(fieldAPI)); 
-            if(String.isBlank(fieldValue)){
+            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)); 
             if(String.valueOf(fielddataType)=='DATE'){
-                System.debug('DATE fieldAPI = '+fieldAPI+' filedData = '+String.valueOf(fieldValueMap.get(fieldAPI)));
-                rentalApplyInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
+                rentalApplyInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-'))); 
             }else if(String.valueOf(fielddataType)=='DATETIME'){
-                String dt = String.valueOf(fieldValueMap.get(fieldAPI));
-                if(String.isNotBlank(dt)&&dt.contains('T')){
-                    dt = dt.replace('T',' ');
-                    rentalApplyInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
-                }else if(String.isNotBlank(dt))  {
-                    rentalApplyInfo.put(fieldAPI, Datetime.valueOf(dt));
-                }          
-            }else if(String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
-                rentalApplyInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
+                if(String.isNotBlank(fieldValue)&&fieldValue.contains('T')){
+                    fieldValue = fieldValue.replace('T',' ');
+                    rentalApplyInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
+                }else if(String.isNotBlank(fieldValue))  {
+                    fieldValue = fieldValue.replace('/', '-') + ':00';
+                    System.debug('fieldValue = ' + fieldValue);
+                    rentalApplyInfo.put(fieldAPI, Datetime.valueOf(fieldValue));
+                }else{
+                    rentalApplyInfo.put(fieldAPI, null);
+                }
+                
+            }else if(String.valueOf(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='CURRENCY'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+                rentalApplyInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', ''))); 
             } else if(String.valueof(fielddataType)=='BOOLEAN'){
                 rentalApplyInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
             }else {

--
Gitblit v1.9.1