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 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
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
--
Gitblit v1.9.1