From a3746d3f4996b94f2258c88838fb3fdf65db8e74 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期二, 22 三月 2022 14:25:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NFM624Rest'
---
force-app/main/default/classes/NFM624Rest.cls | 250 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 175 insertions(+), 75 deletions(-)
diff --git a/force-app/main/default/classes/NFM624Rest.cls b/force-app/main/default/classes/NFM624Rest.cls
index 8b9b01b..9ccbc47 100644
--- a/force-app/main/default/classes/NFM624Rest.cls
+++ b/force-app/main/default/classes/NFM624Rest.cls
@@ -161,8 +161,12 @@
StateList.add(gedata.State);
CityList.add(gedata.City);
ApproverIDList.add(gedata.ApproverID);
- ManagementList.add(gedata.HospitalManagementCode2);
- ManagementList.add(gedata.DepartmentManagementCode2);
+ if(string.isnotblank(gedata.HospitalManagementCode2)){
+ ManagementList.add(gedata.HospitalManagementCode2);
+ }
+ if(string.isnotblank(gedata.DepartmentManagementCode2)){
+ ManagementList.add(gedata.DepartmentManagementCode2);
+ }
//system.debug('AccountCodeList'+AccountCodeList);
if (string.isnotblank(gedata.RelatedHospital)) {
SFDCCodeList.add(gedata.RelatedHospital);
@@ -186,13 +190,14 @@
for (Address_Level__c temp: statetempList) {
StateMap.put(temp.Name, temp.Id);
}
+ system.debug('StateMap----->'+StateMap);
//鏌ヨ甯傚尯Id
Map < String, String > CityMap = new Map < String, String > (); //甯侻ap
List < Address_Level2__c > citytempList = [select Id, Name from Address_Level2__c where Name IN: CityList];
for (Address_Level2__c temp: citytempList) {
CityMap.put(temp.Name, temp.Id);
}
-
+ system.debug('CityMap----->'+CityMap);
//鏌ヨ鍖婚櫌鎵�鏈変汉
Map<string,String> ownerMap = new Map<string,String>();
List<User> ownerList = [select Id,Employee_No__c from User where Employee_No__c IN:ApproverIDList];
@@ -216,10 +221,10 @@
Account.PlatformCode__c,
Account.Management_Code__c,
Account.parent.Department_Class_Label__c,
- Name,
+ Name,
Account.Parent_Management_Code__c,
Account.Parent_PlatformCode__c,
- CManageCode__c,
+ CManageCode__c,
AccountId
from Contact
where CManageCode__c IN: PersonManagementCodeList
@@ -257,12 +262,16 @@
OCM_man_province_HP__c,
Name, Management_Code__c,
Is_Active__c, AgentCode_Ext__c,
+ RelatedMessageGroupNumber__c,
ParentId,
Parent.ParentId,
OwnerId
from Account
where Parent_PlatformCode__c IN: ManagementList
- OR Parent_Management_Code__c IN: SFDCCodeList];
+ OR Parent_Management_Code__c IN: SFDCCodeList
+ OR PlatformCode__c IN: ManagementList
+ OR Management_Code__c IN: SFDCCodeList
+ OR (State_Master__c IN:StateMap.Values() AND City_Master__c IN:CityMap.Values())];
Map <String,Account> DepartmentClassMap = new Map <String,Account>();//鎴樼暐绉戝Map
Map < String, Account > AccountMap = new Map < String, Account > (); //鍖婚櫌绉戝
for (Account ac: AccountList) {
@@ -272,6 +281,9 @@
}
if (string.isNotBlank(ac.PlatformCode__c)) {
AccountMap.put(ac.PlatformCode__c, ac);
+ }
+ if(string.isNotBlank(ac.Name) && ac.ParentId == null && ac.Parent.ParentId == null){
+ AccountMap.put(ac.name,ac);
}
}
system.debug('AccountMap '+AccountMap);
@@ -341,14 +353,14 @@
dpt.Hospital__c = hospital.Id;
//鍒ゆ柇鍖婚櫌鏄惁鏈夋晥
- if ('鏈夋晥'.equals(hospital.Is_Active_Formula__c)) {
+ if ('鏈夋晥'.equals(hospital.Is_Active_Formula__c) || '鏃犳晥'.equals(hospital.Is_Active_Formula__c)) {
string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
//绉戝瀛樺湪
if (AccountMap.containsKey(DepartmentCode)) {
//浜哄憳绠＄悊缂栫爜瀛樺湪
ct.AccountId = AccountMap.get(DepartmentCode).id;//绉戝纭畾锛屽皢鑱旂郴浜烘寕鍦ㄨ绉戝涓�
- ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//鍙槸纭畾锛屽皢灏嗚仈绯讳汉鎵�鏈変汉鐨勫�艰祴涓虹瀹ゆ墍鏈変汉
+ ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//绉戝纭畾锛屽皢灏嗚仈绯讳汉鎵�鏈変汉鐨勫�艰祴涓虹瀹ゆ墍鏈変汉
system.debug('personCode' + personCode);
if (string.isnotblank(personCode)) {
system.debug('浜哄憳绠＄悊缂栫爜瀛樺湪');
@@ -436,29 +448,140 @@
contactMap.put(Gedata.DepartmentManagementCode2, ct);
}
}
- }else if('鏃犳晥'.equals(hospital.Is_Active_Formula__c)){
- logstr += 'error:璇ュ尰闄㈡棤鏁堬紝姝ゆ潯鏁版嵁璺宠繃';
- continue;
}else{
- logstr += '璇ュ尰闄㈠浜庤崏妗堜腑锛岃绛夊緟瀹℃壒瀹屾垚';
+ logstr += '璇ュ尰闄㈠浜庤崏妗堜腑/鐢宠涓紝璇风瓑寰呭鎵瑰畬鎴�';
+ //鐘舵��------>鑽夋涓�/鐢宠涓�------->绛夊緟锛宲lan1:鎶婂尰闄d鍐欏埌鏃ュ織琛ㄤ笂锛堝悗缁绱㈡牴鎹尰闄d妫�绱㈡湭澶勭悊杩囩殑鏃ュ織锛�,plan2:鎶奙essageGroupNumber瀛樺埌鍖婚櫌涓�
rowData.NFM624_Secondary_processing__c = false;
continue;
}
- } else { //鍖婚櫌涓嶅瓨鍦�
- system.debug('鏂板缓鍖婚櫌 閫昏緫5閫昏緫10 鏃犺浜哄憳绠＄悊缂栫爜鏄惁鏈夊�奸兘闇�瑕佹柊寤哄尰闄�');
- hp.Name = gedata.AccountName; //鍖婚櫌鍚嶈祴鍊�
- if(ownerMap.containsKey(gedata.ApproverID)){
- hp.OwnerId = ownerMap.get(gedata.ApproverID);//瀹℃牳浜哄憳鍛樺伐缂栫爜璧嬪�肩粰鐢ㄦ埛鎵�鏈変汉
+ } else { //鍖婚櫌涓嶅瓨鍦� 鍒欓渶瑕佸鍔犲垽鏂牴鎹悕鍒ら噸
+ if(accountMap.containskey(gedata.AccountName)){//濡傛灉鏍规嵁鍚嶅瓧鍒ゆ柇鏈夐噸澶嶅垯鏁版嵁鏂板缓鎸囧悜杩欎釜鍖婚櫌
+ Account dpt = new Account();
+ Account hospital = AccountMap.get(gedata.AccountName);
+ dpt.PlatformCode__c = gedata.DepartmentManagementCode2;
+ dpt.Hospital__c = hospital.Id;
+ //鍖婚櫌瀛樺湪鈫撳彇鐘舵��,鏈夋晥鏃犳晥閮芥柊寤�
+ if ('鏈夋晥'.equals(hospital.Is_Active_Formula__c) || '鏃犳晥'.equals(hospital.Is_Active_Formula__c)) {
+ string DepartmentCode = string.isNotBlank(gedata.RelatedDepartment) ? gedata.RelatedDepartment : gedata.DepartmentManagementCode2;
+ string DepartmentClasskey = gedata.AccountName + ' ' + gedata.DepartmentClass;
+ //绉戝瀛樺湪
+ if (AccountMap.containsKey(DepartmentCode)) {//鍥犱负SOQL娌℃湁妫�绱㈠埌绉戝鎵�浠ユ病鏈夊垽瀹氫负娌℃湁绉戝
+ //浜哄憳绠＄悊缂栫爜瀛樺湪
+ ct.AccountId = AccountMap.get(DepartmentCode).id;//绉戝纭畾锛屽皢鑱旂郴浜烘寕鍦ㄨ绉戝涓�
+ ct.OwnerId = AccountMap.get(DepartmentCode).OwnerId;//鍙槸纭畾锛屽皢灏嗚仈绯讳汉鎵�鏈変汉鐨勫�艰祴涓虹瀹ゆ墍鏈変汉
+ system.debug('personCode' + personCode);
+ if (string.isnotblank(personCode)) {
+ system.debug('浜哄憳绠＄悊缂栫爜瀛樺湪');
+ //鑱旂郴浜哄瓨鍦� 11 鍖婚櫌鍚嶅瓧鎺掗噸瀛樺湪锛岀瀹ゅ瓨鍦紝鏇存柊鑱旂郴浜猴紝 瀹屾垚
+ if (peopleMap.containsKey(personCode)) {
+ system.debug('11閫昏緫 鍚嶅瓧鏌ラ噸鍖婚櫌 鏈夌瀹� 鏈変汉鍛樼鐞嗙紪鐮佷笖鏌ユ壘鏈夋浜� 鍔ㄤ綔锛氭洿鏂�');
+ ct.Id = peopleMap.get(personCode).Id;
+ upsertContactList.add(ct);
+ } else { //鑱旂郴浜轰笉瀛樺湪 12 瀹屾垚
+ system.debug('12閫昏緫 鍚嶅瓧鏌ラ噸鍖婚櫌 鏈夌瀹� 鏈変汉鍛樼鐞嗙紪鐮佷絾鏌ユ壘鏃犳浜� 鍔ㄤ綔锛氭姤閿�');
+ logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
+ continue;
+ }
+ } else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
+ //鎼滅储浜哄悕/涓斿湪褰撳墠鎴樼暐绉戝绉戝涓�
+ System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
+ string namekey = gedata.Name;
+ system.debug('DepartmentClasskey = '+DepartmentClasskey);
+ system.debug('nameMap22222222 '+nameMap);
+ if (nameMap.containskey(DepartmentClasskey)) { // 16 瀹屾垚 鏇存柊鎿嶄綔
+ Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
+ if (sMap.containsKey(namekey)) {
+ system.debug('Id璧嬪��'+sMap);
+ ct.id = sMap.get(namekey).id;
+ system.debug('16閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鍖婚櫌鏌ラ噸瀛樺湪 鏈夌瀹� 浜哄悕鏌ユ壘鏈� 鍔ㄤ綔锛氭洿鏂拌仈绯讳汉 ');
+ } else { // 17 瀹屾垚
+ system.debug('17閫昏緫 鏃犱汉鍛樼鐞嗙紪鐮� 鍖婚櫌鏌ラ噸瀛樺湪 鏈夌瀹� 浜哄悕鏌ユ壘鏃� 鍔ㄤ綔锛氭柊寤鸿仈绯讳汉 ');
+ }
+ }
+ upsertContactList.add(ct);
+ }
+ dpt.Id = AccountMap.get(DepartmentCode).Id;
+ upsertAccountList.add(dpt);
+ } else { //绉戝涓嶅瓨鍦�
+ //涓虹瀹よ祴鍊�
+ dpt.Name = gedata.DepartmentName;
+ dpt.RecordTypeId = RecordTypeMap.get(gedata.DepartmentClass);
+ //鍥犱负娌℃湁鍖婚櫌绠＄悊缂栫爜锛屾棤娉曟绱㈠埌鎴樼暐绉戝锛屾墍浠ュ湪缁欑瀹ょ殑鎴樼暐绉戝瀛楁璧嬪�兼椂绌烘寚閽�
+ //dpt.Department_Class__c = DepartmentClassMap.get(gedata.DepartmentClass).Id;
+ //dpt.ParentId = DepartmentClassMap.get(gedata.DepartmentClass).Id;
+ if (string.isnotblank(personCode)) { //浜哄憳绠＄悊缂栫爜瀛樺湪
+ if (peopleMap.containsKey(personCode)) { //浜哄憳绠＄悊缂栫爜鏌ユ壘鏈夊�� 13 瀹屾垚
+ System.debug('13閫昏緫');
+ //鏂板缓绉戝+鏂板缓鑱旂郴浜�,
+ ct.id = peopleMap.get(personCode).id;
+ contactMap.put(Gedata.DepartmentManagementCode2, ct);
+ system.debug('contactMap ' + contactMap);
+ dpt.Department_Name__c = gedata.DepartmentName;
+ upsertAccountList.add(dpt);
+ //upsertContactList.add(ct);
+ } else { //浜哄憳绠＄悊缂栫爜鏌ユ壘鏃犲�� 14 瀹屾垚
+ system.debug('14閫昏緫');
+ logstr += 'error:浜哄憳绠＄悊缂栫爜 [PersonManagementCode] 瀵瑰簲鐨勮仈绯讳汉涓嶅瓨鍦紝姝ゆ潯鏁版嵁璺宠繃';
+ continue;
+ }
+ } else { //浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�
+ system.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦�');
+ string namekey = gedata.DepartmentName+ ' ' + gedata.Name;
+ //string namekey = gedata.AccountName + ' ' + gedata.DepartmentName + ' ' + gedata.DepartmentClass + ' ' + gedata.Name;
+ system.debug('DepartmentClasskey'+DepartmentClasskey);
+ system.debug('351nameMap '+nameMap);
+ if (nameMap.containsKey(DepartmentClasskey)) { //鏌ユ壘鏄惁瀛樺湪璇ユ垬鐣ョ瀹�
+ System.debug('浜哄憳绠＄悊缂栫爜涓嶅瓨鍦ㄧ殑鎯呭喌涓嬫垬鐣ョ瀹ゅ瓨鍦�');
+ system.debug('鎴樼暐绉戝瀛樺湪' + nameMap.get(DepartmentClasskey));
+ Map < String, Contact > sMap = nameMap.get(DepartmentClasskey);
+ if (sMap.containsKey(namekey)) { //鏌ユ壘瀛樺湪 18 瀹屾垚
+ system.debug('18閫昏緫');
+ system.debug('璇ヨ仈绯讳汉瀛樺湪');
+ ct.id = sMap.get(namekey).id;
+ upsertAccountList.add(dpt);
+ upsertContactList.add(ct);
+ // if(sMap.containsKey(gedata.Name)){
+ // ct.Id = sMap.get(gedata.Name).Id;
+ // }
+ }else if(sMap.containsKey(gedata.Name)){
+ system.debug('1234567890');
+ ct.Id = sMap.get(gedata.Name).Id;
+ //upsertAccountList.add(dpt);
+ }
+ system.debug('contactMap ' + contactMap);
+ System.debug('19閫昏緫');
+ contactMap.put(Gedata.DepartmentManagementCode2, ct);
+ }
+ system.debug('鍒涘缓鑱旂郴浜哄拰绉戝');
+ dpt.Department_Name__c = gedata.DepartmentName;
+ upsertAccountList.add(dpt);
+ contactMap.put(Gedata.DepartmentManagementCode2, ct);
+ }
+ }
+ }else{
+ logstr += '璇ュ尰闄㈠浜庤崏妗堜腑/鐢宠涓紝璇风瓑寰呭鎵瑰畬鎴�';
+ //鐘舵��------>鑽夋涓�/鐢宠涓�------->绛夊緟锛宲lan1:鎶婂尰闄d鍐欏埌鏃ュ織琛ㄤ笂锛堝悗缁绱㈡牴鎹尰闄d妫�绱㈡湭澶勭悊杩囩殑鏃ュ織锛�,plan2:鎶奙essageGroupNumber瀛樺埌鍖婚櫌涓�
+ hospital.RelatedMessageGroupNumber__c += iflog.MessageGroupNumber__c + ';';
+ rowData.NFM624_Secondary_processing__c = false;
+ upsertAccountList.add(hospital);
+ }
+ }else{
+ //鈫撴柊寤哄尰闄�
+ system.debug('鏂板缓鍖婚櫌 閫昏緫5閫昏緫10閫昏緫15閫昏緫20 鏃犺浜哄憳绠＄悊缂栫爜鏄惁鏈夊�奸兘闇�瑕佹柊寤哄尰闄�');
+ hp.Name = gedata.AccountName; //鍖婚櫌鍚嶈祴鍊�
+ if(ownerMap.containsKey(gedata.ApproverID)){
+ hp.OwnerId = ownerMap.get(gedata.ApproverID);//瀹℃牳浜哄憳鍛樺伐缂栫爜璧嬪�肩粰鐢ㄦ埛鎵�鏈変汉
+ }
+ hp.RecordTypeId = '01210000000QemG';
+ hp.OCM_Category__c = 'L';
+ hp.PlatformCode__c = gedata.HospitalManagementCode2;
+ hp.State_Master__c = StateMap.get(gedata.State); // 鐪�
+ hp.City_Master__c = CityMap.get(gedata.City); // 甯�
+ hp.Hospital_Source__c = '鏅烘収鍖荤枟';
+ upsertAccountList.add(hp);
+ System.debug('upsertAccountList'+upsertAccountList);
+ rowData.NFM624_Secondary_processing__c = false;//鏁版嵁闇�瑕佷簩娆″鐞嗘爣璁�
}
- hp.RecordTypeId = '01210000000QemG';
- hp.OCM_Category__c = 'L';
- hp.PlatformCode__c = gedata.HospitalManagementCode2;
- hp.State_Master__c = StateMap.get(gedata.State); // 鐪�
- hp.City_Master__c = CityMap.get(gedata.City); // 甯�
- hp.Hospital_Source__c = '鏅烘収鍖荤枟';
- upsertAccountList.add(hp);
- System.debug('upsertAccountList'+upsertAccountList);
- rowData.NFM624_Secondary_processing__c = false;//鏁版嵁闇�瑕佷簩娆″鐞嗘爣璁�
}
}
system.debug('upsertContactList ' + upsertContactList);
@@ -595,55 +718,7 @@
}
return result;
}
- // global static String contactAllName(String contactName){
- // // 涓浗 澶嶅澶у叏
- // String CompoundSurname = '婵槼銆佸叕鍐躲�佸お鍙斻�佺敵灞犮�佸叕瀛欍�佹厱瀹广�佷徊瀛欍�侀挓绂汇�侀暱瀛欍�佸畤鏂囥�佸徃寰掋�侀矞浜庛�佸徃绌恒�侀椌涓樸�佸瓙杞︺�佷簱瀹樸�佸徃瀵囥�佸帆椹�佸叕瑗裤�侀瀛欍�佸￥椹枫�佸叕鑹�佹紗闆曘�佷箰姝ｃ�佸鐖躲�佽胺姊併�佹嫇璺嬨�佸す璋枫�佽僵杈曘�佷护鐙愩�佹骞层�佺櫨閲屻�佸懠寤躲�佷笢閮�佸崡闂ㄣ�佺緤鑸屻�佸井鐢熴�佸叕鎴枫�佸叕鐜夈�佸叕浠�佹涓樸�佸叕浠层�佸叕涓娿�佸叕闂ㄣ�佸叕灞便�佸叕鍧氥�佸乏涓樸�佸叕浼�佽タ闂ㄣ�佸叕绁栥�佺浜斻�佸叕涔樸�佽疮涓樸�佸叕鐨欍�佸崡鑽ｃ�佷笢閲屻�佷笢瀹�佷徊闀裤�佸瓙涔︺�佸瓙妗戙�佸嵆澧ㄣ�佽揪濂氥�佽甯堛�佸惔閾�';
- // // string allname = '鏈卞惎璐�';
- // // contactName = '绗簲鎯嗘��';
- // String lastName = '';
- // String firstName = '';
- // String result = '';
- // if (contactName.contains('路')) {
- // lastName = contactName.split('路')[0];
- // firstName = contactName.split('路')[1];
- // } else {
- // if (contactName.length() > 2) {
-
- // system.debug('CompoundSurname--->01' + contactName.subString(0, 2));
- // if (CompoundSurname.contains(contactName.subString(0, 2))) {
- // lastName = contactName.substring(0,2);
- // firstName = contactName.substring(2,contactName.length());
- // system.debug('lastName--->'+lastName);
- // system.debug('firstName--->'+firstName);
- // } else {
- // lastName = contactName.substring(0,1);
- // firstName = contactName.substring(1,contactName.length());
- // system.debug('lastName--->'+lastName);
- // system.debug('firstName--->'+firstName);
- // }
- // } else {
- // if (contactName.length() == 2) {
- // lastName = contactName.substring(0,1);
- // firstName = contactName.substring(1,contactName.length());
- // system.debug('lastName--->'+lastName);
- // system.debug('firstName--->'+firstName);
- // } else {
- // lastName = contactName;
- // firstName = contactName;
- // system.debug('lastName--->'+lastName);
- // system.debug('firstName--->'+firstName);
- // }
- // }
- // }
- // if (!contactName.equals(lastName+firstName)) {
- // lastName = contactName;
- // firstName = contactName;
- // }
- // result = lastName + '_' + firstName;
- // //system.debug('CompoundSurname--->02' + CompoundSurname);
- // return result;
- // }
-
+
private static void supplement (String ContactId){
//鎶�620Batch 鍜� 623Batch 鎼繃鏉�
//琛ュ厖璇㈤棶鍗曢儴鍒� start
@@ -716,4 +791,29 @@
}
//琛ュ厖瀛︿細閮ㄥ垎 end
}
+ //鍓嶇疆鏉′欢锛屽尰闄㈢鐞嗙紪鐮佷笉瀛樺湪鐨勬椂鍊欐墽琛岃繖涓搷浣�
+// private static Account duplicate_removal (Map<String,ACcount> accountNameMap,Gedate ged,BatchIF_Log__c iflog){//鍖婚櫌鍚峂ap,鎺ュ彛鏁版嵁锛屾棩蹇楄〃
+// //鏌ヨ鍖婚櫌鏄柊澧炴潯浠禣R 锛堢渷 = 浼犲叆鐪� AND 甯� = 浼犲叆甯傦級锛屽鍔犱竴涓竴鍚嶅瓧涓簁ey鐨刴ap锛屾牴鎹紶鍏ユ暟鎹殑鍚嶅瓧鍒ゆ柇鏄惁瀛樺湪
+// //涓嶅瓨鍦ㄢ�斺�斺��>鏂板缓
+// //瀛樺湪鈥斺��>鍙栫姸鎬�
+// //鐘舵��------>鑽夋涓�/鐢宠涓�------->绛夊緟锛宲lan1:鎶婂尰闄d鍐欏埌鏃ュ織琛ㄤ笂锛堝悗缁绱㈡牴鎹尰闄d妫�绱㈡湭澶勭悊杩囩殑鏃ュ織锛�,plan2:鎶奙essageGroupNumber瀛樺埌鍖婚櫌涓�
+// //鐘舵��------>鏈夋晥锛屾暟鎹柊寤哄埌璇ュ尰闄笅,鍙戦�佽仈绯讳汉淇℃伅
+// //鐘舵��------>鏃犳晥锛屾暟鎹柊寤哄埌璇ュ尰闄笅,鍏堝彂閫佽仈绯讳汉淇℃伅锛屽啀鍙戦�佸尰闄俊鎭�
+// if(accountNameMap.containskey(ged.AccountName)){//鏍规嵁鍖婚櫌鍚嶅垽鏂尰闄㈡槸鍚﹀瓨鍦�
+// //鍖婚櫌瀛樺湪
+// Account tempHp = accountNameMap.get(ged.AccountName);
+// if('鑽夋涓�'.equals(tempHp.Is_Active_Formula__c) || '鐢宠涓�'.equals(tempHp.Is_Active_Formula__c)){//鍒ゆ柇鍖婚櫌鐘舵��
+// //鑽夋涓�/鐢宠涓姸鎬�
+// tempHp.RelatedMessageGroupNumber__c += iflog.MessageGroupNumber__c + ';';
+// //continue;
+// return tempHp;
+// }else{
+
+// }
+// }else{
+// //鍖婚櫌涓嶅瓨鍦�
+
+// return hp;
+// }
+// }
}
\ No newline at end of file
--
Gitblit v1.9.1