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/NewAndEditReportController.cls | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditReportController.cls b/force-app/main/default/classes/NewAndEditReportController.cls
index 53ca9f1..8985c5e 100644
--- a/force-app/main/default/classes/NewAndEditReportController.cls
+++ b/force-app/main/default/classes/NewAndEditReportController.cls
@@ -11,23 +11,28 @@
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 String no1Name{get; set;}
+ public String no1Id{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;
//鑾峰彇鎵�鏈夊瓧娈�
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Report__c').getDescribe().fields.getMap().keyset());
// Add fields to controller. This is to avoid the SOQL error in visualforce page
- controller.addFields(fieldList);
+ if (!Test.isRunningTest()) {
+ controller.addFields(fieldList);
+ }
SObject obj = controller.getRecord();
if(obj.Id != null){
//鏇存柊
@@ -61,8 +66,28 @@
sfIdToAWSIdMap.put(String.valueof(ReportData.Person_In_Charge__r.Id).subString(0,15),ReportData.Person_In_Charge__r.AWS_Data_Id__c);
}
contactsInfo = JSON.serialize(sfIdToAWSIdMap);
+ }else if(ApexPages.currentPage().getParameters().get('CF00N10000008ps6d_lkid') != null){
+ //OPD璁″垝杩囨潵鐨勶紝閫氳繃Id鏌ュ嚭鍊熷嚭澶囧搧鐢宠No1杩涜灞曠ず
+ String opdPlanId = ApexPages.currentPage().getParameters().get('CF00N10000008ps6d_lkid');
+ if(String.isNotEmpty(opdPlanId)&&String.isNotBlank(opdPlanId)){
+ List<OPDPlan__c> opList = [select NewestRentalCode__c from OPDPlan__c where id=:opdPlanId];
+ if(opList!=null&&opList.size()>0){
+ no1Name = opList[0].NewestRentalCode__c;
+ List<Rental_Apply__c> racList = [select id from Rental_Apply__c where Name=:opList[0].NewestRentalCode__c];
+ if(racList!=null&&racList.size()>0){
+ no1Id = racList[0].id;
+ }
+ }
+ }
+ rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
+ obj.put('OwnerId',UserInfo.getUserId());
}else{
//鏂板缓
+ Map<string,string> mso = ApexPages.currentPage().getParameters();
+ //鍖婚櫌/绉戝/缁忛攢鍟�(鎵嬪啓)
+ if(mso.containsKey('00N10000002GE3Z')){
+ controller.getRecord().put('Manual_Name__c',mso.get('00N10000002GE3Z'));
+ }
rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
obj.put('OwnerId',UserInfo.getUserId());
}
@@ -75,8 +100,10 @@
PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Report__c');
staticResource = JSON.serialize(piIntegration);
encryptedAPIList = piIntegration.PIFields;
+ System.debug('piIntegration.PIFields = ' + encryptedAPIList);
staticResourceContact = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
sobjectPrefix = piIntegration.sobjectPrefix;
+ layoutSectionsStr = JSON.serialize(layoutSections);
}
global class Response{
@@ -88,6 +115,7 @@
@RemoteAction
global static Response saveReport(String reportJson,String transId,Boolean isNew) {
System.debug('report Info:' + JSON.serialize(reportJson));
+ System.debug('report Info:' + reportJson);
//System.debug('rtTypeId: ' + rtTypeId);
//1. Prepare the payload for report
Schema.SObjectType reportSchema = schemaMap.get(sobjectTypeValue);
@@ -98,22 +126,25 @@
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)){
+ 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'){
- reportInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
+ System.debug('DATE fieldAPI = '+fieldAPI+' filedData = '+String.valueOf(fieldValueMap.get(fieldAPI)));
+ //reportInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
+ reportInfo.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',' ');
reportInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
- }
- }else if(String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
- reportInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
+ }else if(String.isNotBlank(dt)) {
+ reportInfo.put(fieldAPI, Datetime.valueOf(dt));
+ }
+ }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+ reportInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?null:Decimal.valueOf(fieldValue.replace(',', '')));
} else if(String.valueof(fielddataType)=='BOOLEAN'){
reportInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
}else {
--
Gitblit v1.9.1