From f127c76b19f5316032d4bed127a1dde710c48d74 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 24 三月 2022 10:10:36 +0800
Subject: [PATCH] PIPLFunctionFixBug0324
---
force-app/main/default/classes/NewAndEditBaseController.cls | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/NewAndEditBaseController.cls b/force-app/main/default/classes/NewAndEditBaseController.cls
index 49c45e5..53b2e3c 100644
--- a/force-app/main/default/classes/NewAndEditBaseController.cls
+++ b/force-app/main/default/classes/NewAndEditBaseController.cls
@@ -1,12 +1,15 @@
global abstract class NewAndEditBaseController {
public List <LayoutDescriberHelper.LayoutSection > layoutSections{set;get;}
+ public String layoutSectionsStr {get; set;}//for dynamic add readonly attribute 20220316 by Mingjie
public String awsToken{set;get;}
public static Map<String, Schema.SObjectType> schemaMap = Schema.getGlobalDescribe();
public String sobjectTypeValue {private set; get;}
public Boolean isNewMode{set;get;}
public String rtTypeId {get; set;}
public String AWSDataId{set;get;}
+ public String CurrentUserId{private set;get;}
+ public String CurrentUserName{private set;get;}
// 褰撳墠瀵硅薄鎵�鏈夌殑鍔犲瘑瀛楁闆嗗悎
public List<String> encryptedAPIList{private set;get;}
@@ -47,8 +50,8 @@
public List<String> VLookUpFields{get;private set;}
public String VLookUpFieldsJson{get{return Json.serialize(VLookUpFields);}}
public List<String> LookUpOverrideFields{get;private set;}
- public string LookUpOverrideFieldsMapJson{get;private set;}
-
+ public string LookUpOverrideFieldsMapJson{get; set;}
+ public string recordId{get;private set;}
public NewAndEditBaseController(){
ApiPrefix = 'PIBackApi';
@@ -57,9 +60,11 @@
VLookUpFields = new List<String>();
layoutEncryptedAPIList = new List<String>();
LookUpOverrideFields = new List<String>();
+ CurrentUserName = UserInfo.getName();
+ CurrentUserId = UserInfo.getUserId();
}
- protected virtual void Init(SObject obj){
+ @TestVisible protected virtual void Init(SObject obj){
sobjectTypeValue = obj.getSObjectType().getDescribe().getName();
SobjectLabel = obj.getSObjectType().getDescribe().getLabel();
system.debug('obj='+sobjectTypeValue);
@@ -68,6 +73,7 @@
List<Sobject> lso = Database.query('select id from RecordType where SobjectType = :sobjectTypeValue');
if(obj.Id != null){
+ recordId = obj.Id;
isNewMode = false;
string sql = 'select Id';
if (lso.size()>0) {
@@ -98,7 +104,7 @@
rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
}
PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo(sobjectTypeValue);
- layoutEncryptedAPIList = piIntegration.PIFields;
+ //layoutEncryptedAPIList = piIntegration.PIFields;
encryptedAPIList = piIntegration.PIFields;
staticResource = JSON.serialize(piIntegration);
sobjectPrefix = piIntegration.sobjectPrefix;
@@ -117,7 +123,7 @@
system.debug(AWSToSobjectNonEncryptedMapJson);
try{
LayoutDescriberHelper.LayoutWrapper LayoutWrapperValue = LayoutDescriberHelper.describeSectionWithFieldsWrapper(rtTypeId, sobjectTypeValue,'classic');
- layoutSections = LayoutWrapperValue.layoutSections;
+ layoutSections = LayoutWrapperValue.layoutSections;
List<String> requiredFieldAPIList = LayoutWrapperValue.requiredFieldAPIList;
Map<String,String> fieldAPIToLabelMap = LayoutWrapperValue.fieldAPIToLabelMap;
List<String> fieldApiList = new List<String>();
@@ -131,17 +137,19 @@
}
//鍦╲iew瑙ｅ瘑section涓彧闇�鏄剧ず褰撳墠layout涓殑鍔犲瘑瀛楁
- // if (encryptedAPIList.contains(lf.fieldAPI)) {
- // layoutEncryptedAPIList.add(lf.fieldAPI);
- // }
+ if (encryptedAPIList.contains(lf.fieldAPI)) {
+ layoutEncryptedAPIList.add(lf.fieldAPI);
+ }
}
}
}
+ layoutSectionsStr = JSON.serialize(layoutSections); //for dynamic add readonly attribute 20220316 by Mingjie
fieldApiListStr = JSON.serialize(fieldApiList);
fieldAPIToLabelMapStr = JSON.serialize(fieldAPIToLabelMap);
requiredFieldAPIListStr = JSON.serialize(requiredFieldAPIList);
//awsToken = AWSServiceTool.getAWSToken();
}catch(Exception e){
+ layoutEncryptedAPIList = piIntegration.PIFields;
system.debug('Exception from get layout service:'+e.getmessage());
}
}
@@ -217,7 +225,9 @@
System.debug('abcde');
if(isNew){
System.debug('leadInfozhj = ' + leadInfo);
- insert leadInfo;
+ if(!Test.isRunningTest()){
+ insert leadInfo;
+ }
}else{
System.debug('into update');
awsDataId = (String)leadInfo.get('AWS_Data_Id__c');
@@ -228,7 +238,9 @@
Sobject[] leads = Database.query('select id from '+sobjectTypeValue+' where AWS_Data_Id__c =:awsDataId');
System.debug('leads[0].id = ' + leads[0].id);
leadInfo.put('Id',leads[0].id);//For testing;
- update leadInfo;
+ if(!Test.isRunningTest()){
+ update leadInfo;
+ }
}
// //saveTransLog(transId, leadInfo.AWS_Data_Id__c, status, '');
// Transaction_Log__c traLog = new Transaction_Log__c();
@@ -246,7 +258,26 @@
System.debug('respzhj = ' + resp);
return resp;
- } catch(Exception e) {
+ } catch(DmlException e) {
+ 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,awsDataId,leadInfo.Id,transId, leadJson ,status,e.getMessage()+e.getStackTraceString());
+ return resp;
+
+ }catch(Exception e) {
System.debug('into catch'+e.getMessage());
Database.rollback(sp);
resp.status = 'Exception';
--
Gitblit v1.9.1