From 3ba0123db48f8bab81ddf0913e1b95280ef545e8 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 17:56:53 +0800
Subject: [PATCH] Deploy0331
---
force-app/main/default/classes/NewAndEditReportController.cls | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditReportController.cls b/force-app/main/default/classes/NewAndEditReportController.cls
index 638443e..3ed3c83 100644
--- a/force-app/main/default/classes/NewAndEditReportController.cls
+++ b/force-app/main/default/classes/NewAndEditReportController.cls
@@ -19,7 +19,17 @@
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 List<String> layoutEncryptedAPIList{private set;get;}
+ public final string ApiPrefix{get;private set;}
+ public Map<string,string> AWSToSobjectEncryptedMap{get;private set;}
+ public string AWSToSobjectEncryptedMapJson{get{return JSON.serialize(AWSToSobjectEncryptedMap);}}
public NewAndEditReportController(ApexPages.StandardController controller) {
+ ApiPrefix = 'PIBackApi';
+ layoutEncryptedAPIList = new List<String>();
+ AWSToSobjectEncryptedMap = new Map<string,string>();
sobjectId = [SELECT CustomObjectId,CustomObjectName FROM CustomObjectUserLicenseMetrics where CustomObjectName ='Report' limit 1].CustomObjectId;
isNewMode = true;
Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
@@ -28,7 +38,9 @@
//鑾峰彇鎵�鏈夊瓧娈�
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){
//鏇存柊
@@ -43,6 +55,9 @@
rtTypeId = ReportData.RecordTypeId;
AWSDataId = ReportData.AWS_Data_Id__c;
Map<String,String> sfIdToAWSIdMap = new Map<String,String>();
+ system.debug('ReportData.Practitioner1__r.Id:' + ReportData.Practitioner1__r.Id);
+ system.debug('ReportData.Practitioner1__r.AWS_Data_Id__c:' + ReportData.Practitioner1__r.AWS_Data_Id__c);
+
if(ReportData.Practitioner1__r.Id != null && ReportData.Practitioner1__r.AWS_Data_Id__c!=null){
sfIdToAWSIdMap.put(String.valueof(ReportData.Practitioner1__r.Id).subString(0,15),ReportData.Practitioner1__r.AWS_Data_Id__c);
}
@@ -62,8 +77,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());
}
@@ -76,9 +111,22 @@
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);
+ for (LayoutDescriberHelper.LayoutSection ls : layoutSections) {
+ for (LayoutDescriberHelper.LayoutField lf : ls.layoutFields) {
+ //鍦╲iew瑙ｅ瘑section涓彧闇�鏄剧ず褰撳墠layout涓殑鍔犲瘑瀛楁
+ if (encryptedAPIList.contains(lf.fieldAPI)) {
+ layoutEncryptedAPIList.add(lf.fieldAPI);
+ }
+ }
+ }
+ for (PI_Field_Policy_Detail__c PIDetail : piIntegration.PIDetails) {
+ AWSToSobjectEncryptedMap.put(PIDetail.AWS_Field_API__c, PIDetail.SF_Field_API_Name__c);
+ }
+ System.debug('AWSToSobjectEncryptedMap = ' + AWSToSobjectEncryptedMap);
}
global class Response{
@@ -90,6 +138,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,26 +147,39 @@
Report__c reportInfo = new Report__c();
System.debug('鑷畾涔夋牸寮忚浆鎹㈠紑濮�');
+ //2. Save Record Process
+ String status = 'success';
+ Response resp = new Response();
+ Savepoint sp = Database.setSavepoint();
+ String rid = '';
//鑷畾涔夋牸寮忚浆鎹�
+ try{
for (String fieldAPI: fieldValueMap.keySet()) {
- 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'){
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, 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'){
+ System.debug('fieldValueMap:' + fieldValueMap);
String dt = String.valueOf(fieldValueMap.get(fieldAPI));
+ System.debug('fieldValueMap.get(fieldAPI)' + fieldValueMap.get(fieldAPI));
+ System.debug('dt:'+dt);
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))));
+ reportInfo.put(fieldAPI, Datetime.valueOf(dt.replace('/', '-') + ':00'));
+ }else{
+ reportInfo.put(fieldAPI, null);
+ }
+ }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+ //reportInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
+ 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 {
@@ -125,24 +187,25 @@
}
}
System.debug('鑷畾涔夋牸寮忚浆鎹㈢粨鏉�');
-
- //2. Save Record Process
- String status = 'success';
- Response resp = new Response();
- Savepoint sp = Database.setSavepoint();
- String rid = '';
- try{
+
if(isNew){
- System.debug('reportInfo = ' + reportInfo);
- insert reportInfo;
+ System.debug('reportInfo = ' + reportInfo);
+ if(!Test.isRunningTest()){
+ insert reportInfo;
+ } else {
+ Report__c reportTest = new Report__c();
+ insert reportTest;
+ }
}else{
System.debug('into update');
String awsDataId = (String)reportInfo.get('AWS_Data_Id__c');
System.debug('awsDataId = ' + awsDataId);
report__c[] reports = [select id from report__c where AWS_Data_Id__c =:awsDataId];
System.debug('reports[0].id = ' + reports[0].id);
- reportInfo.put('Id',reports[0].id);//For testing;
- update reportInfo;
+ reportInfo.put('Id',reports[0].id);//For testing;
+ if(!Test.isRunningTest()){
+ update reportInfo;
+ }
}
rid=reportInfo.Id;
PIHelper.saveTransLog(sobjectTypeValue,(String)reportInfo.get('AWS_Data_Id__c'),rid,transId,reportJson ,status,'');
@@ -151,6 +214,26 @@
resp.status = status;
return resp;
+ }catch(DmlException e) {
+ status = 'fail';
+ Integer index = 0;
+ System.debug(e.getNumDml());
+ System.debug(e.getDmlFields(index));
+ System.debug(e.getDmlId(index));
+ System.debug(e.getDmlIndex(index));
+ System.debug(e.getDmlMessage(index));
+ System.debug(e.getDmlStatusCode(index));
+ System.debug(e.getDmlType(index));
+ system.debug(e.getMessage());
+ system.debug(e.getStackTraceString());
+
+ System.debug('into catch'+e.getMessage());
+ Database.rollback(sp);
+ resp.status = 'Exception';
+ resp.message ='淇濆瓨澶辫触锛屽師鍥�:'+ e.getDmlMessage(index);
+ PIHelper.saveTransLog(sobjectTypeValue,(String)reportInfo.get('AWS_Data_Id__c'),rid,transId,reportJson,status,e.getMessage()+e.getStackTraceString());
+ return resp;
+
} catch(Exception e) {
System.debug('into catch'+e.getMessage());
Database.rollback(sp);
--
Gitblit v1.9.1