From a1369f4a77132580a86ea45b4f22cd3f8723664a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 24 五月 2023 11:47:46 +0800
Subject: [PATCH] 20230524 stage backup
---
force-app/main/default/classes/DNUpsertBatch.cls | 31 +++
force-app/main/default/classes/ConsumApplyTriggerHandler.cls | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++
force-app/main/default/classes/OCSMHandler.cls | 14 +
force-app/main/default/classes/updateESignBatch.cls | 6
4 files changed, 462 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/classes/ConsumApplyTriggerHandler.cls b/force-app/main/default/classes/ConsumApplyTriggerHandler.cls
index c352c37..d110bbb 100644
--- a/force-app/main/default/classes/ConsumApplyTriggerHandler.cls
+++ b/force-app/main/default/classes/ConsumApplyTriggerHandler.cls
@@ -1046,6 +1046,423 @@
}
@TestVisible private static void test() {
Integer i = 0;
-
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/DNUpsertBatch.cls b/force-app/main/default/classes/DNUpsertBatch.cls
index 66ba7d8..a0bf320 100644
--- a/force-app/main/default/classes/DNUpsertBatch.cls
+++ b/force-app/main/default/classes/DNUpsertBatch.cls
@@ -291,11 +291,12 @@
Map < String, String > provinceGIMap = new Map< String, String > ();
//妫�绱CSM绠＄悊鐪佸璞�
//闆嗕腑閲囪喘璇环 澧炲姞妫�绱㈠姪鐞�
- List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c from OCM_Management_Province__c ];
+ List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c from OCM_Management_Province__c ];
//瀛樻斁map<鐪侊紝鎷呭綋>
for (OCM_Management_Province__c omp: ompList) {
provinceOwnerMap.put(omp.Name, omp.SalesManage__c);
- provinceGIMap.put(omp.Name,omp.GI_assistant__c);
+ //provinceGIMap.put(omp.Name,omp.GI_assistant__c); //Commented by Li Jun 20230420
+ provinceGIMap.put(omp.Name, omp.Window1__c);// Add By Li Jun 鏇存柊 绛炬敹鍗曠殑銆愯惀涓氬姪鐞嗐�戝�硷紝浠嶰CSM绠＄悊鐪佸搴旂殑銆愯惀涓氱獥鍙ｃ�戝瓧娈佃幏鍙�
}
// 鐢靛瓙绛炬敹鍗� end
@@ -573,12 +574,30 @@
Statu_Achievements__r.orderType__c
//鏃犲伩鍑哄簱鏍囪瘑 thh 2021-11-01 end
//acc鏍囪瘑 end
+ //Add by Li Jun 20230420 start
+ ,Opportunity__r.OCM_man_province_cus__c
+ //Add By Li Jun 20230420 end
from Statu_Achievements_DN__c where
Name in: DNNoSet];
return DNList;
}
global void finish(Database.BatchableContext BC) {
}
+
+ //Add By Li Jun 0420 Start query management province
+ private static Map<String,OCM_Management_Province__c> provinceManagementMap{set;get;}
+ public static Map<String,OCM_Management_Province__c> getManagementProvince(){
+ if(provinceManagementMap !=null && provinceManagementMap.keySet().size()>0 ){
+ return provinceManagementMap;
+ }
+ provinceManagementMap = new Map<String,OCM_Management_Province__c>();
+ List <OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c from OCM_Management_Province__c];
+ for (OCM_Management_Province__c omp: ompList) {
+ provinceManagementMap.put(omp.Name,omp);
+ }
+ return provinceManagementMap;
+ }
+ //Add By Li Jun 0420 End
/* 鏋勫缓绛炬敹鍗曪細
* eSFMap 鏄郴缁熼噷闈㈢幇鏈夌殑绛炬敹鍗�
* key 涓� DN鍙凤紱
@@ -731,10 +750,14 @@
// 鐢靛瓙绛炬敹鍗� 璧嬪�艰惀涓氬姪鐞嗗拰钀ヤ笟绠＄悊閮ㄦ媴褰� start
//闆嗕腑閲囪喘鐨勮浠� 绮剧悽鎶�鏈� wql 2020/01/11 start
if(opp.Group_purchase_PCL__c){
- tempSADN.Sales_assistant_name_text__c = provinceGIMap.get('闆嗛噰璇�');
+ system.debug('闆嗛噰璇�');
+ tempSADN.Sales_assistant_name_text__c = provinceGIMap.containskey('闆嗛噰璇�')?provinceGIMap.get('闆嗛噰璇�'):null; //Add By Li Jun 20230523
+ //tempSADN.Sales_assistant_name_text__c = provinceGIMap.get('闆嗛噰璇�'); //Commented By Li Jun 20230420
tempSADN.RC_Manager__c = provinceOwnerMap.get('闆嗛噰璇�');
}else{
- tempSADN.Sales_assistant_name_text__c = opp.Sales_assistant_name_text__c;
+ system.debug('闈為泦閲囪');
+ //tempSADN.Sales_assistant_name_text__c = opp.Sales_assistant_name_text__c; //Commented By Li Jun 20230420
+ tempSADN.Sales_assistant_name_text__c =opp.OCM_man_province_cus__c!='' && provinceGIMap.containskey(opp.OCM_man_province_cus__c)?provinceGIMap.get(opp.OCM_man_province_cus__c):null; //Add By Li Jun 20230523
tempSADN.RC_Manager__c = provinceOwnerMap.get(opp.OCM_man_province_cus__c);
}
//闆嗕腑閲囪喘鐨勮浠� 绮剧悽鎶�鏈� wql 2020/01/11 end
diff --git a/force-app/main/default/classes/OCSMHandler.cls b/force-app/main/default/classes/OCSMHandler.cls
index 221da45..a8aa3db 100644
--- a/force-app/main/default/classes/OCSMHandler.cls
+++ b/force-app/main/default/classes/OCSMHandler.cls
@@ -5,6 +5,9 @@
OCM_Management_Province__c old = null;
List<String> noList = new List<String>();
+ //Add By Li Jun 20230420 Start OCSM鐪佺殑銆愯惀涓氱獥鍙ｃ�戜汉鍛樺彂鐢熷彉鍔ㄦ椂锛岄渶瑕佹洿鏂扮幇鏈夌殑鏈畬鎴愮殑绛炬敹鍗曠殑銆愯惀涓氬姪鐞嗐�戝��
+ Set<String> changedWindowProvince = new set<String>();
+ //Add By Li Jun 20230420 End
for (OCM_Management_Province__c local : newList) {
if (Trigger.isInsert) {
@@ -45,12 +48,23 @@
noList.add(old.OnlinePlatformWindow3__c);
}
}
+ //Add By Li Jun 20230420 Start
+ if (local.Window1__c != null && local.Window1__c != old.Window1__c) {
+ changedWindowProvince.add(local.Name);
+ }
+ //Add By Li Jun 20230420 End
+
}
}
if (noList.size() > 0) {
NFM621Controller.callout('', noList);
}
+ //Add By Li Jun 20230420 Start
+ if(changedWindowProvince.size() > 0){
+ SyncProvinceWIndowToSignForm.syncProvinceWIndow(changedWindowProvince);
+ }
+ //Add By Li Jun 20230420 End
}
}
//LY 2021/11/12 end
\ No newline at end of file
diff --git a/force-app/main/default/classes/updateESignBatch.cls b/force-app/main/default/classes/updateESignBatch.cls
index cce7048..05488e2 100644
--- a/force-app/main/default/classes/updateESignBatch.cls
+++ b/force-app/main/default/classes/updateESignBatch.cls
@@ -709,7 +709,7 @@
}
}
//缁欒惀涓氬姪鐞嗚祴鍊�
- eSignForm.Sales_assistant_name_text__c = eSignFormEntry.Sales_assistant_ID__c;
+ //eSignForm.Sales_assistant_name_text__c = eSignFormEntry.Sales_assistant_ID__c;// Commented By Li Jun 20230420
//瀛樹竴涓猧d
idlast = eSignFormEntry.Id;
//绛炬敹鍗昻ame鐢ㄤ綔鏂囦欢鍛藉悕
@@ -1170,14 +1170,14 @@
List < eSignForm__c > eSignFormLastList = new List < eSignForm__c >();
//妫�绱CSM绠＄悊鐪佸璞�
- List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c from OCM_Management_Province__c where Name IN: provinceList];
+ List < OCM_Management_Province__c > ompList = [select id, Name, SalesManage__c,GI_assistant__c,Window1__c from OCM_Management_Province__c where Name IN: provinceList];
//瀛樻斁map<鐪侊紝鎷呭綋>
for (OCM_Management_Province__c omp : ompList) {
//涓嶇敤map<String,list>鐨� 鍘熷洜鏄� 鎯� ocsm绠＄悊鐪� 鍜岀鏀跺崟 钀ヤ笟鎷呭綋鐨勯『搴忎繚鎸佷竴鑷�
//String salesManage = omp.SalesManage__c+','+omp.SalesManage2__c+','+omp.SalesManage3__c;
//provinceOwnerMap.put(omp.Name, salesManage);
provinceOwnerMap.put(omp.Name, omp.SalesManage__c);
- provinceGIMap.put(omp.Name, omp.GI_assistant__c);
+ provinceGIMap.put(omp.Name, omp.Window1__c);//Update By Li Jun 20230420 for 绛炬敹鍗曡惀涓氬姪鐞嗕粠GI/SP鍔╃悊鏀逛负绛炬敹鍗昈CSM鐪佺殑钀ヤ笟绐楀彛
}
//鈶犱负true鐨勬椂鍊� 鏄叾浠栨病鍙戠敓鍙樺寲鍙湁ocsm鐪佷笂钀ヤ笟鎷呭綋鏀瑰彉
//鈶′负false鐨勬椂鍊欙紝鏈変腑闂磋〃姝ｅ父鏇存柊鐨勬儏鍐�
--
Gitblit v1.9.1