From 896e69e68ecc01b0b8a4c03dd010e0a31603be6e Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 10 五月 2022 15:13:27 +0800
Subject: [PATCH] Merge branch 'PIPLFunctionReportEnhance0509'
---
force-app/main/default/classes/OnCallController.cls | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/OnCallController.cls b/force-app/main/default/classes/OnCallController.cls
index f6beda8..3740276 100644
--- a/force-app/main/default/classes/OnCallController.cls
+++ b/force-app/main/default/classes/OnCallController.cls
@@ -1,9 +1,11 @@
global without sharing class OnCallController {
+ public String layoutSectionsStr {get; set;}//for dynamic add readonly attribute
public List <LayoutDescriberHelper.LayoutSection > layoutSections{set;get;}
public String awsToken{set;get;}
public static Map<String, Schema.SObjectType> schemaMap = Schema.getGlobalDescribe();
public static String sobjectTypeValue = 'On_Call__c';
public Boolean isNewMode{set;get;}
+ public Boolean isCloneMode{protected set;get;}
public String rtTypeId {get; set;}
public String AWSDataId{set;get;}
public List<String> encryptedAPIList{set;get;}
@@ -16,10 +18,12 @@
public String PIPL_Input_Account_Error_Msg{set;get;}
public String sobjectPrefix{set;get;}
public String sobjecttypeForFrontEnd{set;get;}
+ public String sfRecordIdForEdit{set;get;}//Add By LiJun for edit record from daily report, 20220510
// public String sobjectId{set;get;}
public OnCallController(ApexPages.StandardController controller) {
// sobjectId = [SELECT CustomObjectId,CustomObjectName FROM CustomObjectUserLicenseMetrics where CustomObjectName ='OnCall' limit 1].CustomObjectId;
isNewMode = true;
+ isCloneMode = false;
Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
PIPL_Name_Label = Label.PIPL_Name_Label;
PIPL_Input_Account_Error_Msg = label.PIPL_Input_Account_Error_Msg;
@@ -27,19 +31,30 @@
//鑾峰彇鎵�鏈夊瓧娈�
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('On_Call__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);
+ }
+ Map<string,string> mso = ApexPages.currentPage().getParameters();
+ System.debug('mso:' + mso);
+ if(mso != null && mso.containsKey('newclone')){
+ isCloneMode = true;
+ }
+ System.debug('isClone:' + isCloneMode);
SObject obj = controller.getRecord();
if(obj.Id != null){
//鏇存柊
isNewMode = false;
On_Call__c onCallData = [select Id,AWS_Data_Id__c from On_Call__c where id =: obj.Id];
AWSDataId = onCallData.AWS_Data_Id__c;
+ sfRecordIdForEdit = obj.Id;//Add By LiJun for Edit Record from NFM609, 20220510
}else{
//鏂板缓
rtTypeId = null;
+ obj.put('OwnerId',UserInfo.getUserId());
}
LayoutDescriberHelper.LayoutWrapper LayoutWrapperValue = LayoutDescriberHelper.describeSectionWithFieldsWrapper(rtTypeId, 'On_Call__c','classic');
layoutSections = LayoutWrapperValue.layoutSections;
+ layoutSectionsStr = JSON.serialize(layoutSections); //for dynamic add readonly attribute
List<String> requiredFieldAPIList = LayoutWrapperValue.requiredFieldAPIList;
Map<String,String> fieldAPIToLabelMap = LayoutWrapperValue.fieldAPIToLabelMap;
requiredFieldAPIListStr = JSON.serialize(requiredFieldAPIList);
@@ -66,27 +81,31 @@
On_Call__c onCallInfo = new On_Call__c();
//鑷畾涔夋牸寮忚浆鎹�
for (String fieldAPI: fieldValueMap.keySet()) {
- system.debug('field API'+fieldAPI);
+ 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;
- }
+ system.debug('Field Type:'+fielddataType+' field Value='+fieldValue);
if(String.valueOf(fielddataType)=='DATE'){
- onCallInfo.put(fieldAPI, Date.valueOf(String.valueOf(fieldValueMap.get(fieldAPI)).replace('/', '-')));
+ onCallInfo.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',' ');
- onCallInfo.put(fieldAPI, Datetime.valueOfGmt(dt));
- }
- }else if(String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
- onCallInfo.put(fieldAPI, Decimal.valueOf(String.valueOf(fieldValueMap.get(fieldAPI))));
+ if(String.isNotBlank(fieldValue)&&fieldValue.contains('T')){
+ fieldValue = fieldValue.replace('T',' ');
+ onCallInfo.put(fieldAPI, Datetime.valueOfGmt(fieldValue));
+ //20220405 By ChenYanan Start
+ }else if(String.isNotBlank(fieldValue)) {
+ fieldValue = fieldValue.replace('/', '-') + ':00';
+ onCallInfo.put(fieldAPI, Datetime.valueOf(fieldValue));
+ //20220405 By ChenYanan End
+ }else{
+ onCallInfo.put(fieldAPI, null);
+ }
+ }else if(String.valueof(fielddataType)=='CURRENCY'|| String.valueof(fielddataType)=='PERCENT'||String.valueOf(fielddataType)=='Number'||String.valueOf(fielddataType)=='DOUBLE' ){
+ onCallInfo.put(fieldAPI, (String.isBlank(fieldValue)||String.isEmpty(fieldValue))?0:Decimal.valueOf(fieldValue));
} else if(String.valueof(fielddataType)=='BOOLEAN'){
onCallInfo.put(fieldAPI, fieldValueMap.get(fieldAPI));
}else {
- onCallInfo.put(fieldAPI, String.valueOf(fieldValueMap.get(fieldAPI)));
- }
+ onCallInfo.put(fieldAPI,fieldValue);
+ }
}
//2. Save Record Process
@@ -94,16 +113,30 @@
Response resp = new Response();
Savepoint sp = Database.setSavepoint();
String rid = '';
+ Boolean isClone = false;
+ String awsDataId = '';
+ String sfRecordId = '';
try{
- System.debug('abcde');
- if(isNew){
+ System.debug('abcde'+isNew);
+ awsDataId = (String)onCallInfo.get('AWS_Data_Id__c');
+ sfRecordId = (String)onCallInfo.get('Id');
+ if (string.isBlank(awsDataId)) {
+ throw new DMLException('鏇存柊鏃禔WS_Data_Id__c涓嶈兘涓虹┖');
+ }
+ System.debug('awsDataId = ' + awsDataId);
+ On_Call__c[] onCalls = Database.query('select id from On_Call__c where AWS_Data_Id__c =:awsDataId or id =:sfRecordId');
+ if(!isNew){
+ isClone = onCalls.size() == 0;
+ }
+ system.debug('isClone'+isClone + ' isNew'+isNew);
+ if(isNew || isClone){
System.debug('onCallInfozhj = ' + onCallInfo);
insert onCallInfo;
}else{
System.debug('into update');
- String awsDataId = (String)onCallInfo.get('AWS_Data_Id__c');
- System.debug('awsDataId = ' + awsDataId);
- On_Call__c[] onCalls = [select id from On_Call__c where AWS_Data_Id__c =:awsDataId];
+ // String awsDataId = (String)onCallInfo.get('AWS_Data_Id__c');
+ // System.debug('awsDataId = ' + awsDataId);
+ // On_Call__c[] onCalls = [select id from On_Call__c where AWS_Data_Id__c =:awsDataId];
System.debug('onCalls[0].id = ' + onCalls[0].id);
onCallInfo.put('Id',onCalls[0].id);//For testing;
update onCallInfo;
--
Gitblit v1.9.1