From 52951f976f4a31d96c80ecbe5f9635bd6f4f7d89 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:12:10 +0800
Subject: [PATCH] 后续的修改但是没上传git的内容
---
force-app/main/default/classes/NFM624Rest.cls | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 84f63b1..98f53b3 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -227,20 +227,23 @@
AccountId
from Contact
where CManageCode__c IN: PersonManagementCodeList
- OR Account.Parent_PlatformCode__c IN: ManagementList
- OR Account.Parent_Management_Code__c IN: SFDCCodeList]; //鏍规嵁浜哄憳绠＄悊缂栫爜妫�绱㈣仈绯讳汉
+ OR (Account.Parent_PlatformCode__c IN: ManagementList AND LastName_Encrypted__c IN:NameList)
+ OR (Account.Parent_Management_Code__c IN: SFDCCodeList AND LastName_Encrypted__c IN:NameList )
+ ORDER BY MobilePhone ASC,CManageCode__c ASC]; //鏍规嵁浜哄憳绠＄悊缂栫爜妫�绱㈣仈绯讳汉
Map < String, Contact > peopleMap = new Map < String, Contact > (); //鑱旂郴浜�
system.debug('peopleList '+peopleList);
for (Contact ct: peopleList) {
if (string.isnotblank(ct.Account.parent.Name)) {
Map < String, Contact > snameMap = new Map < String, Contact > ();
- string namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c;
+ string namekey = ct.Account.Name + ' ' + ct.LastName_Encrypted__c.trim();
+ string nameKey2 = ct.Account.Management_Code__c + ' ' + ct.LastName_Encrypted__c.trim();
// snameMap.put(namekey,ct);
if (nameMap.containsKey(ct.Account.parent.Name)) {
snameMap = nameMap.get(ct.Account.parent.Name);
}
snameMap.put(namekey, ct);
- snameMap.put(ct.LastName_Encrypted__c, ct);
+ snameMap.put(nameKey2,ct);
+ snameMap.put(ct.LastName_Encrypted__c.trim(), ct);
nameMap.put(ct.Account.parent.Name, snameMap);
system.debug('snameMap'+snameMap);
}
@@ -294,32 +297,40 @@
logstr += gedata.DepartmentName;
- string comefrom = gedata.RegSource == '1' ? '鏅烘収鍖荤枟' : '鏈嶅姟瀹㈡埛绔�'; //骞冲彴鏉ユ簮
+ string comefrom = gedata.RegSource == '1' ? '鏅烘収鍖荤枟' : (gedata.RegSource == '2' ? '鏈嶅姟瀹㈡埛绔�' :'鍖绘嫇缃�'); //骞冲彴鏉ユ簮
//鏂板缓鍖婚櫌
Account hp = new Account();
//鏂板缓鑱旂郴浜�
Contact ct = new Contact();
- ct.LastName = gedata.Name;
- ct.FirstName = '';
- ct.Type__c = gedata.Type;
- ct.Type_Encrypted__c = gedata.TypeEncrypted;//add for pipl sushanhu 20220316
- ct.MobilePhone = gedata.Mobile;
- ct.RegSource__c = comefrom;
- ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
- // //UPDATE TO AWS 瀛樺偍鐨勭粺涓�骞冲彴id
- // ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //缁熶竴骞冲彴Id
- ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
- ct.Contact_address__c = gedata.ContactAddress;//鑱旂郴鍦板潃
- ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃 add 20220215
- ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//骞冲彴绂佺敤鏍囪瘑
- //ct.IsFromPlatform__c = true; //鏉ヨ嚜鏅烘収鍖荤枟鍒涘缓
- ct.Ignore_Same_Name__c = true; //涓嶆槸閲嶅鐨勫鎴峰悕
- //ct.SendToComPlat__c = true;
- ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws瀛樺偍鍑瘉
- ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 鎵嬫満瀵嗘枃
- ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 濮撳悕瀵嗘枃
+ if(gedata.AgentFlag){
+ //ct.FirstName = ''; 2022-4-7 yjk 娉ㄩ噴鎺�
+ ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
+ ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
+ //ct.CManageCode__c = gedata.PersonManagementCode;//浜哄憳绠＄悊缂栫爜
+ }else{
+ ct.LastName = gedata.Name;
+ ct.FirstName = '';
+ ct.Type__c = gedata.Type;
+ ct.Type_Encrypted__c = gedata.TypeEncrypted;//add for pipl sushanhu 20220316
+ ct.MobilePhone = gedata.Mobile;
+ ct.RegSource__c = comefrom;
+ ct.UnifiedI_Contact_ID__c = gedata.ContactId; //缁熶竴骞冲彴Id
+ // //UPDATE TO AWS 瀛樺偍鐨勭粺涓�骞冲彴id
+ // ct.AWS_UnifiedI_Contact_ID__c=gedata.ContactId; //缁熶竴骞冲彴Id
+ ct.ServicePlatformCode__c = gedata.ServiceUserId; //鏈嶅姟骞冲彴鐢ㄦ埛Id
+ ct.Contact_address__c = gedata.ContactAddress;//鑱旂郴鍦板潃
+ ct.Contact_address_Encrypted__c=gedata.ContactAddressEncrypted;//鑱旂郴鍦板潃瀵嗘枃 add 20220215
+ ct.Platform_disabled_representation__c = gedata.ForbiddenStatus;//骞冲彴绂佺敤鏍囪瘑
+ //ct.IsFromPlatform__c = true; //鏉ヨ嚜鏅烘収鍖荤枟鍒涘缓
+ ct.Ignore_Same_Name__c = true; //涓嶆槸閲嶅鐨勫鎴峰悕
+ //ct.SendToComPlat__c = true;
+ ct.AWS_Data_Id__c =gedata.DataId;//add 20220215 aws瀛樺偍鍑瘉
+ ct.MobilePhone_Encrypted__c =gedata.MobileEncrypted;//add 20220215 鎵嬫満瀵嗘枃
+ ct.LastName_Encrypted__c =gedata.NameEncrypted;//add 20220215 濮撳悕瀵嗘枃
+ }
+
String personCode = gedata.PersonManagementCode;
@@ -328,6 +339,7 @@
if (gedata.AgentFlag == true) {
//鏇存柊缁忛攢鍟嗚仈绯讳汉
if (!peopleMap.containsKey(personCode)) {
+ rowData.Is_Error__c = 1;
logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
continue;
}
@@ -348,6 +360,7 @@
if ('鏈夋晥'.equals(hospital.Is_Active_Formula__c)) {
string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
+ system.debug('DepartmentClasskey------->'+DepartmentClasskey);
//绉戝瀛樺湪
if (AccountMap.containsKey(DepartmentCode)) {
//浜哄憳绠＄悊缂栫爜瀛樺湪
@@ -363,13 +376,14 @@
upsertContactList.add(ct);
} else { //鑱旂郴浜轰笉瀛樺湪 2 瀹屾垚
system.debug('2閫昏緫 鏈夊尰闄� 鏈夌瀹� 鏈変汉鍛樼鐞嗙紪鐮佷絾鏌ユ壘鏃犳浜� 鍔ㄤ綔锛氭姤閿�');
+ rowData.Is_Error__c = 1;
logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
continue;
}
} else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
//鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
- string namekey = gedata.NameEncrypted;
+ string namekey = gedata.RelatedDepartment + ' ' + gedata.NameEncrypted;
system.debug('DepartmentClasskey = '+DepartmentClasskey);
system.debug('nameMap22222222 '+nameMap);
if (nameMap.containskey(DepartmentClasskey)) { // 6 瀹屾垚 鏇存柊鎿嶄綔
@@ -379,7 +393,9 @@
if (sMap.containsKey(namekey)) {
system.debug('Id璧嬪��'+sMap);
ct.id = sMap.get(namekey).id;
- } else { // 7 瀹屾垚
+ } else if(sMap.containsKey(gedata.NameEncrypted)){
+ ct.id = sMap.get(gedata.NameEncrypted).id;
+ }else { // 7 瀹屾垚
system.debug('7閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鏈夊尰闄� 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
}
}
@@ -405,6 +421,7 @@
//upsertContactList.add(ct);
} else { //浜哄憳绠＄悊缂栫爜鏌ユ壘鏃犲�� 4 瀹屾垚
system.debug('4閫昏緫');
+ rowData.Is_Error__c = 1;
logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
continue;
}
@@ -424,7 +441,7 @@
system.debug('8閫昏緫');
system.debug('璇ヨ仈绯讳汉瀛樺湪');
ct.id = sMap.get(namekey).id;
- upsertAccountList.add(dpt);
+ //upsertAccountList.add(dpt);//鍙互娉ㄩ噴
upsertContactList.add(ct);
// if(sMap.containsKey(gedata.Name)){
// ct.Id = sMap.get(gedata.Name).Id;
@@ -447,6 +464,7 @@
}
}
}else if('鏃犳晥'.equals(hospital.Is_Active_Formula__c)){
+ rowData.Is_Error__c = 1;
logstr += 'error:璇ュ尰闄㈡棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃';
continue;
}else{
@@ -553,39 +571,34 @@
private static String verify(GeData gda) {
String result = '';
- if (string.isblank(gda.ContactId)) {
- result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
- }
- if (gda.AgentFlag == null) {
- result += 'DataError:缁忛攢鍟嗘爣璇嗕负绌篭n';
- }
- if (string.isblank(gda.Name)) {
- result += 'DataError锛氬鍚嶄负绌篭n';
- }
- if (string.isblank(gda.NameEncrypted)) {
- result += 'DataError锛氬鍚嶅瘑鏂囦负绌篭n';
- }
- if (string.isblank(gda.Mobile)) {
- result += 'DataError锛氭墜鏈哄彿涓虹┖\n';
- }
- if (string.isblank(gda.MobileEncrypted)) {
- result += 'DataError锛氭墜鏈哄彿瀵嗘枃涓虹┖\n';
- }
- if (string.isblank(gda.RegSource)) {
- result += 'DataError锛氭敞鍐屽钩鍙版潵婧愪负绌篭n';
- }if (string.isblank(gda.DataId)) {
- result += 'DataError锛欰WS鍔犲瘑鍑嵁涓虹┖\n';
- }
if (gda.AgentFlag) {
+ if (string.isblank(gda.ContactId)) {
+ result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
+ }
if (string.isblank(gda.PersonManagementCode)) {
result += 'DataError锛歅ersonManagementCode 浜哄憳绠＄悊缂栫爜涓虹┖\n';
}
- } else {
- // if (string.isnotblank(gda.PersonManagementCode) && string.isBlank(gda.RelatedHospital)) {
- // result += 'DataError: 鍏宠仈鍖婚櫌缂栫爜涓虹┖\n';
- // }
- if(string.isBlank(gda.RelatedDepartment) && String.isBlank(gda.ApproverID)){
- result += 'DataError: 鍦ㄥ叧鑱擲FDC绉戝[RelatedDepartment]涓虹┖鏃讹紝瀹℃牳浜哄憳鍛樺伐缂栫爜[ApproverID]蹇呭～\n';
+ if (string.isblank(gda.ServiceUserId)) {
+ result += 'ServiceUserId 鏈嶅姟骞冲彴鐢ㄦ埛Id涓虹┖\n';
+ }
+ }else{
+ if (string.isblank(gda.ContactId)) {
+ result += 'DataError: ContactId 缁熶竴骞冲彴ID涓虹┖\n';
+ }
+ if (gda.AgentFlag == null) {
+ result += 'DataError:缁忛攢鍟嗘爣璇嗕负绌篭n';
+ }
+ if (string.isblank(gda.Name)) {
+ result += 'DataError锛氬鍚嶄负绌篭n';
+ }
+ if (string.isblank(gda.Mobile)) {
+ result += 'DataError锛氭墜鏈哄彿涓虹┖\n';
+ }
+ if (string.isblank(gda.RegSource)) {
+ result += 'DataError锛氭敞鍐屽钩鍙版潵婧愪负绌篭n';
+ }
+ if(string.isBlank(gda.RelatedHospital) && String.isBlank(gda.HospitalManagementCode2) && String.isBlank(gda.ApproverID)){
+ result += 'DataError: 鏂板缓鍖婚櫌鏃讹紝瀹℃牳浜哄憳鍛樺伐缂栫爜[ApproverID]蹇呭～\n';
}
if (string.isblank(gda.HospitalManagementCode2)) {
result += 'DataError锛氬尰闄㈠钩鍙扮紪鐮佷负绌篭n';
--
Gitblit v1.9.1