From 02ddc35714cbd1688b7cb057f770f1410de79dab Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 11 三月 2022 12:19:33 +0800
Subject: [PATCH] PIPL Updated Code 20220311
---
force-app/main/default/classes/StraightBackAddressController.cls | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/StraightBackAddressController.cls b/force-app/main/default/classes/StraightBackAddressController.cls
index 452d4a3..e63368a 100644
--- a/force-app/main/default/classes/StraightBackAddressController.cls
+++ b/force-app/main/default/classes/StraightBackAddressController.cls
@@ -9,9 +9,14 @@
/***************琛ㄦ牸鏁版嵁*********************/
public List<AddressData> tableData { get; set; }
+ public String tableDataStr{ get; set; }
+ public String staticResource {get; set;}
+ public String staticResourceContact {get; set;}
+ public Contact newCon{get; set;}
/***************搴曢儴 缂栬緫鍜屾柊澧炵殑 瀵硅薄*******************/
public Address__c insUpdData{get;set;}
+ public String insUpdDataStr{get;set;}
/***************琚紪杈戞暟鎹殑id********************/
public String UpdId{get;set;}
@@ -55,6 +60,14 @@
/***************鏄惁鍙戠敓鏁版嵁鎺ュ彛鐨勫簭鍙�*************/
public Integer AddressTypeIndex{get;set;}
+ public String contactId{set;get;}//For Lookup field
+
+ // Add by Li Jun for PIPL 20220308 Start
+ public String contactNameValue{set;get;}
+ public String contactIdValue{set;get;}
+ public String addressDataIds{set;get;}
+ // Add by Li Jun for PIPL 20220308 End
+
public StraightBackAddressController() {
//鑾峰彇url鏁版嵁
RepairId = System.currentPageReference().getParameters().get('id');
@@ -77,6 +90,10 @@
addContact = new Contact();
//鏌ヨ鍒版墍鏈夌殑绉戝绫诲埆
hospitalTypp = '瑷虹檪绉� 銇濄伄浠�,瑷虹檪绉� 鍛煎惛绉�,瑷虹檪绉� 濠︿汉绉�,瑷虹檪绉� 鏅绉�,瑷虹檪绉� 娉屽翱绉�,瑷虹檪绉� 娑堝寲绉�,瑷虹檪绉� 鑰抽蓟鍠夌,瑷虹檪绉戯紙鍏遍�氾級';
+
+
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Address__c'));
+ staticResourceContact = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
}
/**
@@ -86,6 +103,7 @@
String RepairSql = makeTextRepairSql(RepairId);
try{
pc = Database.query(RepairSql);
+ system.debug('pc = ' + pc);
//缁欎竴涓叏灞�鍙橀噺璧嬪�煎尰闄d
if(!String.isBlank(pc.HP_ID__c)){
hospitalId = pc.HP_ID__c;
@@ -126,6 +144,7 @@
ApexPages.addMessages(e);
}
insUpdData = new Address__c();
+ newCon = new Contact();
return null;
}
@@ -141,6 +160,7 @@
insUpdData = tableData[i].address;
}
}
+ insUpdDataStr = JSON.serialize(insUpdData);
}
}
return null;
@@ -163,6 +183,7 @@
}
}
}
+ insUpdDataStr = JSON.serialize(insUpdData);
}
}
return null;
@@ -196,8 +217,12 @@
}
//鑱旂郴浜�
String contactsName = '';
+ String contactsNameEncrypt ='';
+ String contactawsDataId = '';
if(!String.isBlank(tableData[i].address.Contacts__c)){
contactsName = tableData[i].address.Contacts__r.Name;
+ contactsNameEncrypt = tableData[i].address.Contacts__r.LastName_Encrypted__c;
+ contactawsDataId = tableData[i].address.Contacts__r.AWS_Data_Id__c;
}
//瀹㈡埛
String ContactPerson = '';
@@ -208,10 +233,18 @@
//淇濆瓨鏁版嵁鍒颁慨鐞嗚〃涓�
Repair__c rc = new Repair__c();
rc.id=RepairId;
- rc.address_Contacts__c=contactsName;
+ rc.Address_AWS_Data_Id__c = tableData[i].address.AWS_Data_Id__c;
+ rc.Contact_AWS_Data_Id__c = contactawsDataId;
+ rc.address_Contacts__c = contactsName;
+ rc.Address_Contacts_Encrypt__c = contactsNameEncrypt;
rc.address_ZipCode__c = tableData[i].address.ZipCode__c;
+ rc.Address_ZipCode_Encrypt__c = tableData[i].address.ZipCode_Encrypted__c;
rc.address_City__c = cityName;
rc.address_Contacts_Name__c = ContactPerson;
+ rc.Detailed_Address__c = tableData[i].address.Detailed_Address__c;
+ rc.Detailed_Address_Encrypt__c = tableData[i].address.Detailed_Address_Encrypted__c;
+ rc.address_Telephone__c = tableData[i].address.Telephone__c;
+ rc.Address_Telephone_Encrypt__c = tableData[i].address.Telephone_Encrypted__c;
//isUpload锛氭槸鍚︿笂浼燬AP FSEApplyForRepairTime锛歋AP淇悊鐢宠鏃堕棿
if(isUpload && (FSEApplyForRepairTime != null)){
rc.Address_type__c = 'X';
@@ -343,6 +376,8 @@
}
}
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '鍏辨湁 '+indexCou+' 鏉℃暟鎹�'));
+ tableDataStr = JSON.serialize(tableData);
+ system.debug('tableDataStr = ' + tableDataStr);
}catch(Exception e){
//澶辫触鎻愮ず
ApexPages.addMessages(e);
@@ -354,6 +389,12 @@
* 淇濆瓨鍜屼慨鏀圭殑鏂规硶
*/
public PageReference save(){
+ system.debug('Address value:'+JSON.serialize(insUpdData));
+ if(String.isNotBlank(contactIdValue)&&String.isNotEmpty(contactIdValue)){
+ system.debug('Contact Value:'+contactIdValue);
+ insUpdData.Contacts__c = contactIdValue;
+ }
+ system.debug('Address value:'+JSON.serialize(insUpdData));
savepoint sp = Database.setsavepoint();
if(insUpdData != null){
boolean flag = true;
@@ -451,7 +492,8 @@
monicker = surname.substring(1,surname.length());
surname = surname.substring(0,1);
}
- addContact = new Contact(LastName=surname,FirstName=monicker,AccountId=insUpdData.Customer__c,RecordTypeId=typeL);
+ System.debug('newCon = '+newCon);
+ addContact = new Contact(LastName=surname,FirstName=monicker,AccountId=insUpdData.Customer__c,RecordTypeId=typeL,AWS_Data_Id__c = newCon.AWS_Data_Id__c,LastName_Encrypted__c=newCon.LastName_Encrypted__c);
try{
//鏂板涓�鏉¤仈绯讳汉鏁版嵁
insert addContact;
@@ -515,8 +557,8 @@
}
//鏌ヨ鍦板潃琛ㄦ暟鎹�
private String makeTextAddressSql(String typeSearchId) {
- String AddressSql = 'SELECT ID,Address_Classification__c,Customer__c,Customer__r.Name,Contacts__c,Contacts__r.Name,Telephone__c'
- +',Province__c,Province__r.Name,City__c,City__r.name,Detailed_Address__c,Create_Contacts__c,ZipCode__c,CreatedByid '
+ String AddressSql = 'SELECT AWS_Data_Id__c,ID,Address_Classification__c,Customer__c,Customer__r.Name,Contacts__c,Contacts__r.Name,Contacts__r.AWS_Data_Id__c,Telephone__c'
+ +',Province__c,Province__r.Name,City__c,City__r.name,Detailed_Address__c,Create_Contacts__c,ZipCode__c,CreatedByid,Detailed_Address_Encrypted__c,Telephone_Encrypted__c,ZipCode_Encrypted__c,Contacts__r.LastName_Encrypted__c'
+ ' FROM Address__c where id != null';
//绫诲瀷绛涢��
if(!String.isBlank(typeText)){
@@ -542,8 +584,11 @@
AddressSql += ' and Customer__r.Name LIKE \'%' + txtName.trim() + '%\'' ;
}
//璇︾粏鍦板潃绛涢��
- if(!String.isBlank(txtAddress)){
- AddressSql += ' and Detailed_Address__c LIKE \'%' + txtAddress.trim() + '%\'' ;
+ // if(!String.isBlank(txtAddress)){
+ // AddressSql += ' and Detailed_Address__c LIKE \'%' + txtAddress.trim() + '%\'' ;
+ // }
+ if(!String.isBlank(addressDataIds)){
+ AddressSql += ' and AWS_Data_Id__c in('+addressDataIds.trim()+')';
}
//鎺掑簭锛屾牴鎹笂娆′慨鏀规椂闂村拰閲囩敤鏃堕棿杩涜闄嶅簭鎺掑簭,鍊间负绌烘斁鍒板悗闈�
AddressSql += ' order by LastModifiedDate desc,Using_Datetime__c desc NULLS LAST';
@@ -551,6 +596,7 @@
if(String.isBlank(typeSearchId)){
AddressSql += ' limit 1000 ';
}
+ System.debug('AddressSql = '+AddressSql);
return AddressSql;
}
//鏌ヨ鍖婚櫌瀹㈡埛浜哄憳淇℃伅
--
Gitblit v1.9.1