From 69dc5df6ec51f6f7f6737c61d9c4c1e7757a2b96 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 17 三月 2022 21:05:08 +0800
Subject: [PATCH] PIPLFixBugs0317V1

---
 force-app/main/default/classes/NewAndEditReportController.cls |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/classes/NewAndEditReportController.cls b/force-app/main/default/classes/NewAndEditReportController.cls
index 53ca9f1..638443e 100644
--- a/force-app/main/default/classes/NewAndEditReportController.cls
+++ b/force-app/main/default/classes/NewAndEditReportController.cls
@@ -11,17 +11,18 @@
     public String staticResourceContact {get; set;}
     public String requiredFieldAPIListStr {get; set;}
     public String fieldAPIToLabelMapStr {get; set;}
-    public String requiredErrorMsg{set;get;}
+    public String Input_Required_Field_Msg{set;get;}
     public String contactsInfo {set;get;}
     public String PIPL_Input_Account_Error_Msg{set;get;}
     public String SaveAndNewButtonUrl{get;private set;}
     public String sobjectPrefix{get;private set;}
     public String sobjecttypeForFrontEnd{set;get;}
     public String sobjectId{set;get;}
+    public String layoutSectionsStr {get; set;}
     public NewAndEditReportController(ApexPages.StandardController controller) {
         sobjectId = [SELECT CustomObjectId,CustomObjectName  FROM CustomObjectUserLicenseMetrics   where CustomObjectName ='Report' limit 1].CustomObjectId;
         isNewMode = true;
-        requiredErrorMsg = Label.Input_Required_Field_Msg;
+        Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
         PIPL_Input_Account_Error_Msg = label.PIPL_Input_Account_Error_Msg;
         sobjecttypeForFrontEnd = sobjectTypeValue;
         //鑾峰彇鎵�鏈夊瓧娈�
@@ -77,6 +78,7 @@
         encryptedAPIList = piIntegration.PIFields;
         staticResourceContact = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
         sobjectPrefix = piIntegration.sobjectPrefix;
+        layoutSectionsStr = JSON.serialize(layoutSections);
     }
 
     global class Response{
@@ -98,20 +100,22 @@
         System.debug('鑷畾涔夋牸寮忚浆鎹㈠紑濮�');
         //鑷畾涔夋牸寮忚浆鎹�
         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)); 
             if(String.isBlank(fieldValue)){
                 continue;
             }
             if(String.valueOf(fielddataType)=='DATE'){
+                System.debug('DATE fieldAPI = '+fieldAPI+' filedData = '+String.valueOf(fieldValueMap.get(fieldAPI)));
                 reportInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).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',' ');
                     reportInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
-                }             
+                }else if(String.isNotBlank(dt))  {
+                    reportInfo.put(fieldAPI, Datetime.valueOf(dt));
+                }          
             }else if(String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
                 reportInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
             } else if(String.valueof(fielddataType)=='BOOLEAN'){

--
Gitblit v1.9.1