From 0a3c181367008553cd34bc7c4deab70ba3c8bac7 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期四, 19 五月 2022 10:09:52 +0800
Subject: [PATCH] 客户人员重复校验修改为姓名+手机号形式
---
force-app/main/default/classes/ContactTriggerHandler.cls | 42 ++++++++++++---------
force-app/main/default/classes/NFM624Rest.cls | 59 +++++++++++++++++++----------
2 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls
index 3c3c299..54e167f 100644
--- a/force-app/main/default/classes/ContactTriggerHandler.cls
+++ b/force-app/main/default/classes/ContactTriggerHandler.cls
@@ -172,7 +172,7 @@
}else{
//Add By Li Jun for sync agency contact to aws 20220424 start
if(!Test.isRunningTest()){
- SyncAccountContactToAWS.assignOnceOneMinuteLater();
+ SyncAccountContactToAWS.assignOnceOneMinuteLater(aclist);
}
//Add By Li Jun for sync agency contact to aws 20220424 end
}
@@ -255,7 +255,7 @@
// 鎵嬫満鍙峰幓閲嶅強瑙勫垯楠岃瘉 鍙婃柊澧炲鎴蜂汉鍛橀噸鍚嶉獙璇�
public void mobileNumberVerification(){
- Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
+ // Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
Map<String, Map<String,Contact>> accountContactMap = new Map<String, Map<String,Contact>>();
Set<Id> accountIdSet = new Set<Id>();
//鐢ㄦ埛瀵硅薄涓婃壘瀵瑰簲鐨勮仈绯讳汉
@@ -293,18 +293,20 @@
// 鎵嬫満鍙锋湁鍊煎苟涓旇仈绯讳汉鏈夋晥锛岃仈绯讳汉鐨勫鎴锋湁鏁堬紝杩涜鎵嬫満鍙风爜楠岃瘉
if (('鏈夋晥'.equals(contactnew.Isactive__c) || '鏈夊姽'.equals(contactnew.Isactive__c))
&& ('鏈夊姽'.equals(accMap.get(contactnew.AccountId)) || '鏈夋晥'.equals(accMap.get(contactnew.AccountId)))) {
+ // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 start
if(AgencyRecordTypeId.equals(contactnew.RecordTypeId)){
if(String.isNotBlank(contactnew.MobilePhone)){
- Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
- if (isMobilePhone.matches()) {
- contactnew.UniqueNumber__c = contactnew.MobilePhone;
- } else {
+ // Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
+ // if (isMobilePhone.matches()) {
+ contactnew.UniqueNumber__c = contactnew.MobilePhone;
+ // } else {
// 鎵嬫満鍙峰敮涓�瀛楁娓呯┖
- contactnew.UniqueNumber__c = null;
- }
+ // contactnew.UniqueNumber__c = null;
+ // }
} else {
contactnew.UniqueNumber__c = null;
}
+ // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 end
} else if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
if(String.isNotBlank(contactnew.MobilePhone_Encrypted__c)){
contactnew.UniqueNumber__c = contactnew.MobilePhone_Encrypted__c;
@@ -322,15 +324,17 @@
if (accountIdSet.size() > 0) {
List<Contact> contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
+ , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
FROM Contact
WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
if ( contactList.size() > 0) {
for(Contact contact :contactList){
-
- String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
- String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
- String contactFullName = lastNameStr + firstNameStr;
- contactFullName = contact.LastName_Encrypted__c;// 20220314 PI鏀归�� by Bright
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ // String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
+ // String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
+ // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
+ String contactFullName = contact.LastName_Encrypted__c + contact.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
if(string.isBlank(contactFullName)){
continue;
}
@@ -353,17 +357,19 @@
if (accountContactMap.containsKey(accountId)) {
Map<String,Contact> contactFullNameMap = accountContactMap.get(accountId);
- String lastNameStr = String.isNotBlank(contactnew.LastName) ? contactnew.LastName:'';
- String firstNameStr = String.isNotBlank(contactnew.FirstName) ? contactnew.FirstName:'';
- String contactFullName = lastNameStr + firstNameStr;
- contactFullName = contactnew.LastName_Encrypted__c;// 20220314 PI鏀归�� by Bright
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ // String lastNameStr = String.isNotBlank(contactnew.LastName) ? contactnew.LastName:'';
+ // String firstNameStr = String.isNotBlank(contactnew.FirstName) ? contactnew.FirstName:'';
+ // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
+ String contactFullName = contactnew.LastName_Encrypted__c + contactnew.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
if (contactFullNameMap.containsKey(contactFullName)) {
String accountName = contactFullNameMap.get(contactFullName).Account.Name;
String cManageCode = contactFullNameMap.get(contactFullName).CManageCode__c;
// 璺宠繃娴嬭瘯绋嬪簭 鍜� SPO閫氳繃203鎺ュ彛鍒涘缓鐨勮仈绯讳汉
if (!(Test.isRunningTest() || contactnew.IsFromSPO__c)) {
contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠＄悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');
- }
+ }
}
}
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index f86d171..bbaf611 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -18,7 +18,7 @@
// global class GeDatasRest {
// public GeDatas GeDatas;
// }
-
+
global class GeDatas {
public NFMUtil.Monitoring Monitoring;
public GeData[] GeData;
@@ -101,7 +101,6 @@
}
global static void main(String rowData_Id) {
-
// Map<String,String> RecordTypeMap = new Map<String,String>();
// RecordTypeMap.put('','')
//List<RecordType> rectDpt = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName IN ('Department_OTH','Department_GI', 'Department_BF','Department_GYN','Department_GS','Department_URO','Department_ENT','Department_Class_ET') order by DeveloperName desc];
@@ -222,6 +221,7 @@
List < Contact > peopleList = [select Id,
Account.Name,
Department__c,
+ UnifiedI_Contact_ID__c,
Account.parent.Name,
Account.PlatformCode__c,
Account.Management_Code__c,
@@ -230,7 +230,10 @@
Account.Parent_Management_Code__c,
Account.Parent_PlatformCode__c,
CManageCode__c,
- AccountId
+ AccountId,
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ MobilePhone_Encrypted__c
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
from Contact
where CManageCode__c IN: PersonManagementCodeList
OR (Account.Parent_PlatformCode__c IN: ManagementList AND LastName_Encrypted__c IN:NameList)
@@ -249,7 +252,9 @@
}
snameMap.put(namekey, ct);
snameMap.put(nameKey2,ct);
- snameMap.put(ct.LastName_Encrypted__c.trim(), ct);
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ snameMap.put(ct.LastName_Encrypted__c.trim() + ct.MobilePhone_Encrypted__c.trim(), ct);
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
nameMap.put(ct.Account.parent.Name, snameMap);
system.debug('snameMap'+snameMap);
}
@@ -396,11 +401,14 @@
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
System.debug('sMap'+sMap);
System.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
- if (sMap.containsKey(namekey)) {
+ System.debug('sMap.containsKey(gedata.NameEncrypted)'+sMap.containsKey(gedata.NameEncrypted));
+ if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) {
system.debug('Id璧嬪��'+sMap);
ct.id = sMap.get(namekey).id;
- } else if(sMap.containsKey(gedata.NameEncrypted)){
- ct.id = sMap.get(gedata.NameEncrypted).id;
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ } else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
+ ct.id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).id;
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
}else { // 7 瀹屾垚
system.debug('7閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鏈夊尰闄� 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
}
@@ -442,8 +450,8 @@
system.debug('鎴樼暐绉戝瀛樺湪' + nameMap.get(DepartmentClasskey));
Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
system.debug('namekey'+namekey);
- system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey));
- if (sMap.containsKey(namekey)) { //鏌ユ壘瀛樺湪 8 瀹屾垚
+ system.debug('sMap.containsKey(namekey)'+sMap.containsKey(namekey) );
+ if (sMap.containsKey(namekey) && sMap.get(namekey).UnifiedI_Contact_ID__c == null) { //鏌ユ壘瀛樺湪 8 瀹屾垚
system.debug('8閫昏緫');
system.debug('璇ヨ仈绯讳汉瀛樺湪');
ct.id = sMap.get(namekey).id;
@@ -452,11 +460,14 @@
// if(sMap.containsKey(gedata.Name)){
// ct.Id = sMap.get(gedata.Name).Id;
// }
- }else if(sMap.containsKey(gedata.NameEncrypted)){
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+ }else if(sMap.containsKey(gedata.NameEncrypted + gedata.MobileEncrypted) && sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).UnifiedI_Contact_ID__c == null){
system.debug('1234567890');
- ct.Id = sMap.get(gedata.NameEncrypted).Id;
+ ct.Id = sMap.get(gedata.NameEncrypted + gedata.MobileEncrypted).Id;
//upsertAccountList.add(dpt);
+ upsertContactList.add(ct);
}
+ // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
system.debug('contactMap ' + contactMap);
System.debug('9閫昏緫');
contactMap.put(Gedata.DepartmentManagementCode2, ct);
@@ -650,19 +661,27 @@
//List<String> contactIdList = new List<String>();
for (Inquiry_form__c inquiryInfo : inquiryList) {
//contactIdList.add(inquiryInfo.ContactId__c);
- inquiryMap.put(inquiryInfo.ContactId__c, inquiryInfo.Id);
+ // map鐨刱-v鏀归�� thh 20220517 start
+ inquiryMap.put(inquiryInfo.Id, inquiryInfo.ContactId__c);
+ // map鐨刱-v鏀归�� thh 20220517 end
}
- if (contactList.size() >0 ) {
- for (Contact contactInfo : contactList) {
+ // map鐨刱-v鏀归�� thh 20220517 start
+ if (contactList.size() >0 && inquiryMap.size() > 0) {
+ for(String Id : inquiryMap.keySet()){
Inquiry_form__c inquiry = new Inquiry_form__c();
- inquiry.Id = inquiryMap.get(contactInfo.UnifiedI_Contact_ID__c); //ID
- inquiry.Hospital_Name__c = contactInfo.Account.Id; //绉戝鍚�
- inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
- inquiry.Contact_Name__c = contactInfo.Id; //瀹㈡埛濮撳悕
- inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
- inquiryFormList.add(inquiry);
+ for (Contact contactInfo : contactList) {
+ if(inquiryMap.get(Id) == contactInfo.UnifiedI_Contact_ID__c){
+ inquiry.Id = Id; //ID
+ inquiry.Hospital_Name__c = contactInfo.Account.Id; //绉戝鍚�
+ inquiry.Department_Class__c = contactInfo.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被
+ inquiry.Contact_Name__c = contactInfo.Id; //瀹㈡埛濮撳悕
+ inquiry.OwnerId = contactInfo.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉
+ inquiryFormList.add(inquiry);
+ }
+ }
}
}
+ // map鐨刱-v鏀归�� thh 20220517 end
system.debug('inquiryFormList=========>'+inquiryFormList);
if(inquiryFormList.size()>0){
update inquiryFormList;
--
Gitblit v1.9.1