Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/pages/NewAndEditContact.page

@@ -11,7 +11,11 @@
        }
    </style>
    <script>
        
        //zhj MEBG新方案改造 2022-11-25 start
        var accountName = '';
        var dataIdManageCodeMap = {};
        var staticResourceContactV2 = JSON.parse('{!staticResourceContactV2}');
        //zhj MEBG新方案改造 2022-11-25 end
        var config = {};
        config = {
            SobjectName : "{!SobjectName}",
@@ -42,24 +46,48 @@
                return JSON.stringify(leadPayloadList);
            },
            insertOrUpdateBack:function(payloadJson, r, isNewMode){
                
                for(let f in config.AWSToSobjectMap){
                //zhj MEBG新方案改造 2022-11-25 start
                debugger
                if(r.status == '129'){
                    alertErrorMessage('客户 [ '+accountName+ ' ],已存在相同名字的联系人 人员管理编码 ['+dataIdManageCodeMap[r.object[0].dataId]+' ] ，不能重复创建，请了解');
                    unblockUI();
                    return
                }
                if(r.status == '130'){
                    if(r.object[0] && r.object[0].sfRecordId != null && r.object[0].sfRecordId != '')
                        alertErrorMessage('已找到重复值： UniqueNumber__c 与记录值重复，ID 为: '+r.object[0].sfRecordId+'客户人员信息');
                    else
                        alertErrorMessage('数据中存在重复的电话号码');
                    unblockUI();
                    return
                }
                for(let f in config.AWSToSobjectNonEncryptedMap){
                    if(r.object[0].hasOwnProperty(f)){
                        payloadJson[config.AWSToSobjectMap[f]] = r.object[0][f];
                        payloadJson[config.AWSToSobjectNonEncryptedMap[f]] = r.object[0][f];
                    }
                    else{
                        console.log(f + 'is not in r.object[0]');
                    }
                }
                console.log('payloadJson = ' + payloadJson);
                // for(let f in config.AWSToSobjectMap){
                //     if(r.object[0].hasOwnProperty(f)){
                //         payloadJson[config.AWSToSobjectMap[f]] = r.object[0][f];
                //     }
                //     else{
                //         console.log(f + 'is not in r.object[0]');
                //     }
                // }

                for(let f in config.AWSToSobjectEncryptedMap){
                    if(r.object[0].hasOwnProperty(f)){
                        payloadJson[config.AWSToSobjectEncryptedMap[f]] = r.object[0][f];
                    }
                    else{
                        console.log(f + 'is not in r.object[0]');
                    }
                }
                // for(let f in config.AWSToSobjectEncryptedMap){
                //     if(r.object[0].hasOwnProperty(f)){
                //         payloadJson[config.AWSToSobjectEncryptedMap[f]] = r.object[0][f];
                //     }
                //     else{
                //         console.log(f + 'is not in r.object[0]');
                //     }
                // }
                //zhj MEBG新方案改造 2022-11-25 end
                
                if('{!rtTypeId}'){
                    payloadJson.RecordTypeId = '{!rtTypeId}';
@@ -78,6 +106,14 @@
            queryBack:function (data) {
                console.log('data = ' + data);
                if(data.object){
                    for(let i=0; i < config.AWSToSobjectNonEncryptedMapKeySet.length ; i++){
                        if(config.AWSToSobjectNonEncryptedMapKeySet[i] == 'type'){
                            let temp = config.AWSToSobjectNonEncryptedMapKeySet[0];
                            config.AWSToSobjectNonEncryptedMapKeySet[0] = config.AWSToSobjectNonEncryptedMapKeySet[i];
                            config.AWSToSobjectNonEncryptedMapKeySet[i] = temp;
                            break;
                        }
                    }
                    for(let fi in config.AWSToSobjectNonEncryptedMapKeySet){
                        let f = config.AWSToSobjectNonEncryptedMapKeySet[fi];
                        let ele = document.getElementById(api_id_map[config.AWSToSobjectNonEncryptedMap[f]])
@@ -130,7 +166,10 @@
                // document.querySelector("[data-id='Email']").value = data.object.email;
            },
            updateMethod:"NewAndEditContactController.saveContact",
            insertMethod:"NewAndEditContactController.saveContact"
            insertMethod:"NewAndEditContactController.saveContact",
            //zhj MEBG新方案改造 2022-11-24 start
            searchContactByAccountId:"NewAndEditContactController.searchContactByAccountId"
            //zhj MEBG新方案改造 2022-11-24 end
        }
    
        AWSService.sfSessionId = '{!GETSESSIONID()}';
@@ -330,13 +369,19 @@
            let obj = JSON.parse(payloadForNewPI);
            obj[0].dataId = '{!AWSDataId}';
            let payloadForNewPIJson = JSON.stringify(obj);
            AWSService.update(staticResources.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
            //AWSService.update(staticResources.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
            //zhj MEBG新方案改造 2022-11-25 start
            AWSService.update(staticResourceContactV2.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
            //zhj MEBG新方案改造 2022-11-25 end
            
        }

        function NewPIToAWS(sobjJson, payloadForNewPI) {
            let controllerSaveMethod = config.insertMethod;
            AWSService.insert(staticResources.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
            //AWSService.insert(staticResources.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
            //zhj MEBG新方案改造 2022-11-25 start
            AWSService.insert(staticResourceContactV2.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
            //zhj MEBG新方案改造 2022-11-25 end
            
        }
        
@@ -344,7 +389,9 @@
        function checkRequiredFieldMsg(formData) {
            let blankRequiredFields = '';
            for(i = 0;i<requiredFieldAPIList.length;i++){
                if(formData[requiredFieldAPIList[i]]){
                if(formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)){
                    continue;
                }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
                    continue;
                }else{
                    if(blankRequiredFields == ''){
@@ -388,8 +435,49 @@
            // //4. Get Authentication Information for AWS
            // loadAWSAuthentication();

            //zhj MEBG新方案改造 2022-11-24 start
            //新增contactIds字段，在AWS进行contact的唯一性校验，替换ContactTriggerHandler里面的mobileNumberVerification方法
            if('{!rtTypeId}'){
                var RecordTypeId = '{!rtTypeId}';
            }
            var Isactive = document.querySelector("[data-id='Isactive__c']").value;
            console.log('Isactive = ' + Isactive);
            console.log('RecordTypeId = ' + RecordTypeId);
            Visualforce.remoting.Manager.invokeAction(
                config.searchContactByAccountId, 
                sobjJson.AccountId,
                RecordTypeId,
                Isactive,
                function (result, event) {
                    if(result.status == 'fail'){
                        alertErrorMessage(result.message);
                        return
                    }
                    console.log('result = ' + JSON.stringify(result));
                    accountName = result.accountName;
                    dataIdManageCodeMap = result.dataIdManageCodeMap;
                    var contactList = '';
                    for(var i = 0; i<result.contactList.length; i++){
                        if(result.contactList[i].AWS_Data_Id__c)
                            contactList += ',' + result.contactList[i].AWS_Data_Id__c;
                    }
                    contactList = contactList.substring(1);
                    
                    payloadForNewPI = JSON.parse(payloadForNewPI);
                    payloadForNewPI[0].contactIds = contactList;
                    payloadForNewPI[0].isMobileVerif = result.isMobileVerif;
                    payloadForNewPI[0].isNameMobileVerif = result.isNameMobileVerif;
                    payloadForNewPI = JSON.stringify(payloadForNewPI);
                    ProcessPI(sobjJson, payloadForNewPI);
                },
                { escape: true }
            );
            

            // //5. lead to AWS 
            ProcessPI(sobjJson, payloadForNewPI);
            //ProcessPI(sobjJson, payloadForNewPI);
            //zhj MEBG新方案改造 2022-11-24 end

            // awsToken = TestToken;
            // NewPIToAWS(sobjJson,awsToken, payloadForNewPI)
        }