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/OnCallController.cls |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/classes/OnCallController.cls b/force-app/main/default/classes/OnCallController.cls
index 551e515..23a15ff 100644
--- a/force-app/main/default/classes/OnCallController.cls
+++ b/force-app/main/default/classes/OnCallController.cls
@@ -2,7 +2,7 @@
  * @description       : 
  * @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  * @group             : 
- * @last modified on  : 03-17-2022
+ * @last modified on  : 03-28-2022
  * @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
 **/
 global without sharing class OnCallController {
@@ -37,7 +37,7 @@
         // Add fields to controller. This is to avoid the SOQL error in visualforce page
         if(!Test.isRunningTest()){
             controller.addFields(fieldList);  
-        }  
+        }
         SObject obj = controller.getRecord();        
         if(obj.Id != null){
             //鏇存柊
@@ -78,26 +78,33 @@
         On_Call__c onCallInfo = new On_Call__c();
         //鑷畾涔夋牸寮忚浆鎹�
         for (String fieldAPI: fieldValueMap.keySet()) {
-            system.debug('field API='+fieldAPI);
+            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'){
-                onCallInfo.put(fieldAPI,(String.isBlank(fieldValue)||String.isEmpty(fieldValue))? null:Date.valueOf(fieldValue.replace('/', '-')));              
+                onCallInfo.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',' ');
                     onCallInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
+                }else if(String.isNotBlank(fieldValue))  {
+                    fieldValue = fieldValue.replace('/', '-') + ':00';
+                    System.debug('fieldValue = ' + fieldValue);
+                    onCallInfo.put(fieldAPI, Datetime.valueOf(fieldValue));
                 }else{
                     onCallInfo.put(fieldAPI, null);
-                }                    
-            }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
-                onCallInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?0:Decimal.valueOf(fieldValue)); 
+                }
+                
+            }else if(String.valueOf(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='CURRENCY'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+                onCallInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', ''))); 
             } else if(String.valueof(fielddataType)=='BOOLEAN'){
                 onCallInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
             }else {
-                onCallInfo.put(fieldAPI,fieldValue);
-            }                   
+                onCallInfo.put(fieldAPI, String.valueOf(fieldValueMap.get(fieldAPI)));
+            }                  
         }
         
         //2. Save Record Process

--
Gitblit v1.9.1