From eeb7c0a2d6f037d515bb822d739036b69c4dc73a Mon Sep 17 00:00:00 2001 From: 沙世明 <shashiming@prec-tech.com> Date: 星期五, 08 四月 2022 17:14:12 +0800 Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG --- force-app/main/default/classes/RentalApplyController.cls | 51 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 18 deletions(-) diff --git a/force-app/main/default/classes/RentalApplyController.cls b/force-app/main/default/classes/RentalApplyController.cls index f9b442d..24037c2 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 { @@ -24,13 +24,19 @@ public String contactsInfo {set;get;} public String contactId{set;get;} public String PIPL_Input_Account_Error_Msg{set;get;} + public final string ApiPrefix{get;private set;} //Add By Li Jun 20220403 + public Map<string,string> AWSToSobjectEncryptedMap{get;private set;} + public string AWSToSobjectEncryptedMapJson{get{return JSON.serialize(AWSToSobjectEncryptedMap);}} public RentalApplyController(ApexPages.StandardController controller) { + ApiPrefix = 'PIBackApi'; isNewMode = true; Input_Required_Field_Msg = Label.Input_Required_Field_Msg; 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){ //鏇存柊 @@ -84,9 +90,14 @@ Map<String,String> fieldAPIToLabelMap = LayoutWrapperValue.fieldAPIToLabelMap; requiredFieldAPIListStr = JSON.serialize(requiredFieldAPIList); fieldAPIToLabelMapStr = JSON.serialize(fieldAPIToLabelMap); - staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c')); - encryptedAPIList = PIHelper.getPIIntegrationInfo('Rental_Apply__c').PIFields; + PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Rental_Apply__c'); + staticResource = JSON.serialize(piIntegration); + encryptedAPIList = piIntegration.PIFields; staticResourceContact = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact')); + AWSToSobjectEncryptedMap = new Map<String,String>(); + for (PI_Field_Policy_Detail__c PIDetail : piIntegration.PIDetails) { + AWSToSobjectEncryptedMap.put(PIDetail.AWS_Field_API__c, PIDetail.SF_Field_API_Name__c); + } } global class Response{ @@ -106,24 +117,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