From 49dfe80719274f1548737d2e73f78d0604081ccc Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 18 五月 2023 10:30:21 +0800
Subject: [PATCH] 青岛拆分代码
---
force-app/main/default/classes/RepairBeforeInsertHandler.cls | 236 ++++++++++++++++++++++++---------
force-app/main/default/classes/TenderLostController.cls | 49 ++++++
force-app/main/default/classes/StartTradingController.cls | 46 ++++++
force-app/main/default/classes/SetProvinceTargetController.cls | 7
force-app/main/default/classes/AWSServiceTool2V2.cls | 79 +++++++++-
5 files changed, 330 insertions(+), 87 deletions(-)
diff --git a/force-app/main/default/classes/AWSServiceTool2V2.cls b/force-app/main/default/classes/AWSServiceTool2V2.cls
index a8ec45d..1deab34 100644
--- a/force-app/main/default/classes/AWSServiceTool2V2.cls
+++ b/force-app/main/default/classes/AWSServiceTool2V2.cls
@@ -76,18 +76,30 @@
}
//1.鏌ヨ鍑哄搴斾慨鐞嗙殑鏁版嵁
- Repair__c repair = [select Id,Hospital__c,address_Contacts__c,AWS_Data_Id__c from Repair__c where id=:rid];
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� start
+ // Repair__c repair = [select Id,Hospital__c,address_Contacts__c,AWS_Data_Id__c from Repair__c where id=:rid];
+ Repair__c repair = [select Id,Hospital__c,address_Contacts__c,AWS_Data_Id__c,Returns_Product_way__c,
+ Incharge_Staff__r.Profile.name,Incharge_Staff__r.UserRole.name,
+ Incharge_Staff__r.Branch__c from Repair__c where id=:rid];
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� end
Account ac = [SELECT id,OCM_man_province_txt__c,FieldCity_Master_Name__c from Account where id =:repair.Hospital__c];
String province = '';
String city = '';
String provinceAndCity = '';
- if('灞变笢' == ac.OCM_man_province_txt__c){
- if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
- || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
- provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
- }else{
- provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
- }
+ //DB202303246427 LY 20230329 start
+ // if('灞变笢' == ac.OCM_man_province_txt__c){
+ // if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
+ // || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
+ // provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
+ // }else{
+ // provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ // }
+
+ if ('闈掑矝' == ac.OCM_man_province_txt__c) {
+ provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
+ }else if ('灞变笢' == ac.OCM_man_province_txt__c) {
+ provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ //DB202303246427 LY 20230329 end
}else{
provinceAndCity = matchupMap.get(ac.OCM_man_province_txt__c);
}
@@ -95,12 +107,53 @@
province = provinceAndCity.split(',')[0];
city = provinceAndCity.split(',')[1];
}
- String addressSQl = 'SELECT ID,AWS_Data_Id__c,Customer__c,Customer_Name__c,Contacts__c,Contacts__r.AWS_Data_Id__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c'
- + ' from Address__c '
- + ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c =: province and City_Name__c =: city '
- + ' order by Using_Datetime__c desc NULLS LAST ';
- system.debug('addressSQl='+addressSQl);
+ // DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� start
+ String beipCenter = '';
+ if (repair.Returns_Product_way__c == '澶囧搧涓績') {
+ if(repair.Incharge_Staff__c == null){
+ beipCenter = '';
+ }else if (repair.Incharge_Staff__r.Profile.name.startsWith('2B3')) {
+ beipCenter = '鍖椾含澶囧搧涓績';
+ }else if (repair.Incharge_Staff__r.Profile.name.startsWith('2B2')) {
+ if (repair.Incharge_Staff__r.Branch__c == '鍖椾含') {
+ beipCenter = '鍖椾含澶囧搧涓績';
+ }else if (repair.Incharge_Staff__r.Branch__c == '涓婃捣') {
+ beipCenter = '鍗庝笢澶囧搧涓績';
+ }else if (repair.Incharge_Staff__r.Branch__c == '骞垮窞') {
+ beipCenter = '骞垮窞澶囧搧涓績';
+ }
+ }else if (repair.Incharge_Staff__r.UserRole.name == 'CTEC鏁欒偛鏈儴') {
+ if (repair.Incharge_Staff__r.Branch__c == '鍖椾含') {
+ beipCenter = '鍖椾含C-TEC';
+ }else if (repair.Incharge_Staff__r.Branch__c == '涓婃捣') {
+ beipCenter = '涓婃捣C-TEC';
+ }else if (repair.Incharge_Staff__r.Branch__c == '骞垮窞') {
+ beipCenter = '骞垮窞C-TEC';
+ }
+ }
+ }
+ system.debug('beipCenter=========='+beipCenter);
+ String addressSQl = 'SELECT ID,AWS_Data_Id__c,Customer__c,Customer_Name__c,Contacts__c,Contacts__r.AWS_Data_Id__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c from Address__c ';
+ if (String.isNotBlank(beipCenter)) {
+ addressSQl += ' where Address_Classification__c = \'澶囧搧\' and Beipin_Center__c = \'' + beipCenter + '\'';
+ }else{
+ addressSQl += ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c =\'' + province + '\'';
+ addressSQl += 'and City_Name__c =\'' + city + '\'';
+ }
+ addressSQl += ' order by Using_Datetime__c desc NULLS LAST ';
+ system.debug('addressSQl=============='+addressSQl);
List<Address__c> addressList = Database.query(addressSQl);
+
+
+
+
+ // String addressSQl = 'SELECT ID,AWS_Data_Id__c,Customer__c,Customer_Name__c,Contacts__c,Contacts__r.AWS_Data_Id__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c'
+ // + ' from Address__c '
+ // + ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c =: province and City_Name__c =: city '
+ // + ' order by Using_Datetime__c desc NULLS LAST ';
+ // system.debug('addressSQl='+addressSQl);
+ // List<Address__c> addressList = Database.query(addressSQl);
+ // DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� end
//寮�濮嬬粍瑁呮暟鎹�
List<AWSServiceTool2V2.EncryptPushRequestBody> EncryptPushList = new List<AWSServiceTool2V2.EncryptPushRequestBody>();
AWSServiceTool2V2.EncryptPushRequestBody EncryptPush = new AWSServiceTool2V2.EncryptPushRequestBody();
diff --git a/force-app/main/default/classes/RepairBeforeInsertHandler.cls b/force-app/main/default/classes/RepairBeforeInsertHandler.cls
index fd195e6..f7aa1ae 100644
--- a/force-app/main/default/classes/RepairBeforeInsertHandler.cls
+++ b/force-app/main/default/classes/RepairBeforeInsertHandler.cls
@@ -56,12 +56,20 @@
List<String> HospitalId = new List<String>();
List<String> provinceList = new List<String>();//鐪�
List<String> cityList = new List<String>();//甯�
+ List<String> inchargeStaff = new List<String>();//甯�
for (Repair__c nObj : newList) {
//鍖婚櫌鐨凜SM绠＄悊鐪�(鏂囨湰) 鍊间笉涓虹┖锛屽苟涓旀敹璐у湴鍧�涓嶄负绌�
if(nObj.Hospital__c != null && nObj.address_Contacts__c == null && nObj.address_Telephone__c == null && nObj.address_Contacts_Name__c == null && nObj.address_City__c == null && nObj.Detailed_Address__c == null){
HospitalId.add(nObj.Hospital__C);
}
+ inchargeStaff.add(nObj.Incharge_Staff__c);
}
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� start
+ Map<String,user> profileAndRoleMap = new Map<String,user>();
+ for(user re :[select id,Profile.name,Branch__c,UserRole.name from user where id in :inchargeStaff]){
+ profileAndRoleMap.put(re.id, re);
+ }
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� start
if(HospitalId != null && HospitalId.size() > 0){
String HospitalSQl = 'SELECT id,OCM_man_province_txt__c,FieldCity_Master_Name__c from Account where id in :HospitalId';
List<Account> accountList = Database.query(HospitalSQl);
@@ -70,13 +78,19 @@
for(Account ac : accountList){
if(nObj.Hospital__c == ac.id){
String provinceAndCity = '';
- if('灞变笢' == ac.OCM_man_province_txt__c){
- if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
- || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
- provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
- }else{
- provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
- }
+ //DB202303246427 LY 20230329 start
+ // if('灞变笢' == ac.OCM_man_province_txt__c){
+ // if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
+ // || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
+ // provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
+ // }else{
+ // provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ // }
+ if('闈掑矝' == ac.OCM_man_province_txt__c){
+ provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
+ }else if ('灞变笢' == ac.OCM_man_province_txt__c) {
+ provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ //DB202303246427 LY 20230329 end
}else{
provinceAndCity = matchupMap.get(ac.OCM_man_province_txt__c);
}
@@ -93,79 +107,169 @@
system.debug('cityList='+cityList);
system.debug('provinceList='+provinceList);
if(falg && provinceList != null && cityList != null && provinceList.size() > 0 && cityList.size() > 0){
- String addressSQl = 'SELECT ID,Customer__c,Customer_Name__c,Contacts__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c'
- //+ ',Contacts__r.LastName_Encrypted__c,ZipCode_Encrypted__c,Detailed_Address_Encrypted__c,Telephone_Encrypted__c' // PI鏀归�� By Bright 20220407 zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� start
+ // String addressSQl = 'SELECT ID,Customer__c,Customer_Name__c,Contacts__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c'
+ // //+ ',Contacts__r.LastName_Encrypted__c,ZipCode_Encrypted__c,Detailed_Address_Encrypted__c,Telephone_Encrypted__c' // PI鏀归�� By Bright 20220407 zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ // + ' from Address__c '
+ // + ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c in :provinceList and City_Name__c in :cityList '
+ // + ' order by Using_Datetime__c desc NULLS LAST ';
+
+
+ String addressSQl = 'SELECT ID,Customer__c,Customer_Name__c,Contacts__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c '
+ + ' ,Address_Classification__c,Beipin_Center__c '
+ //+ ',Contacts__r.LastName_Encrypted__c,ZipCode_Encrypted__c,Detailed_Address_Encrypted__c,Telephone_Encrypted__c' // PI鏀归�� By Bright 20220407 zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ ' from Address__c '
- + ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c in :provinceList and City_Name__c in :cityList '
+ + ' where ( Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c in :provinceList and City_Name__c in :cityList )'
+ + ' or Address_Classification__c = \'澶囧搧\''
+ ' order by Using_Datetime__c desc NULLS LAST ';
+
+ // gzw DB202212270703 20230301 澶囧搧鍦板潃瀵煎叆鏀归�� end
system.debug('addressSQl='+addressSQl);
- List<Address__c> addressList = Database.query(addressSQl);
-
- if(addressList != null && addressList.size() > 0){
- system.debug(addressList[0]);
+ List<Address__c> addressList = new List<Address__c>();
+ Map<String,Address__c> beipinMap = new Map<String,Address__c>();
+ List<Address__c> addressTempList = Database.query(addressSQl);
+ for (Address__c ad :addressTempList) {
+ if (ad.Address_Classification__c == '澶囧搧') {
+ beipinMap.put(ad.Beipin_Center__c,ad);
+ }else{
+ addressList.add(ad);
+ }
+ }
+ //List<Address__c> addressList = Database.query(addressSQl);
+
+ System.debug('杩涘叆澶囧搧+++++addressTempList ' + addressTempList.size());
+ // if(addressList != null && addressList.size() > 0){
+ if(addressTempList != null && addressTempList.size() > 0){
for (Repair__c nObj : newList) {
- if(nObj.Hospital__c != null && nObj.address_Contacts__c == null && nObj.address_Telephone__c == null && nObj.address_Contacts_Name__c == null && nObj.address_City__c == null && nObj.Detailed_Address__c == null){
- //鐢变簬涓轰簡鍑忓皯select ,鎵�浠ヨ幏鍙栨垜浠厤缃ソ鐨刴ap锛屾牴鎹繚鏈夎澶囦笂鍖婚櫌鐨� OCSM绠＄悊鐪�(鏂囨湰) 鐨勫�硷紝鑾峰彇瀵瑰簲鐨勫湴鍧�涓婄殑鐪佸拰甯�
- for(Account ac : accountList){
- if(nObj.Hospital__c == ac.id){
- String provinceAndCity = '';
- matchupMap.get(ac.OCM_man_province_txt__c);
- if('灞变笢' == ac.OCM_man_province_txt__c){
- if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
- || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
+ System.debug('杩涘叆澶囧搧+++++ ');
+ if (nObj.Returns_Product_way__c == '澶囧搧涓績') {
+ user re = profileAndRoleMap.get(nObj.Incharge_Staff__c);
+ if (re == null) return;
+ String beipCenter = '';
+ if (re.Profile.name.startsWith('2B3')) {
+ beipCenter = '鍖椾含澶囧搧涓績';
+ }else if (re.Profile.name.startsWith('2B2')) {
+ if (re.Branch__c == '鍖椾含') {
+ beipCenter = '鍖椾含澶囧搧涓績';
+ }else if (re.Branch__c == '涓婃捣') {
+ beipCenter = '鍗庝笢澶囧搧涓績';
+ }else if (re.Branch__c == '骞垮窞') {
+ beipCenter = '骞垮窞澶囧搧涓績';
+ }
+ }else if (re.UserRole.name == 'CTEC鏁欒偛鏈儴') {
+ if (re.Branch__c == '鍖椾含') {
+ beipCenter = '鍖椾含C-TEC';
+ }else if (re.Branch__c == '涓婃捣') {
+ beipCenter = '涓婃捣C-TEC';
+ }else if (re.Branch__c == '骞垮窞') {
+ beipCenter = '骞垮窞C-TEC';
+ }
+ }
+ System.debug('杩涘叆澶囧搧+++++ beipCenter' + beipCenter);
+
+ if(String.isNotBlank(beipCenter)){
+ Address__c addressbeip = beipinMap.get(beipCenter);
+ System.debug('杩涘叆澶囧搧+++++ addressbeip' + addressbeip.id);
+ //鑱旂郴浜�
+ String contactsName = '';
+ String contactsNameEncrypt = '';
+ if(!String.isBlank(addressbeip.Contacts__c)){
+ contactsName = addressbeip.Contacts_Name__c;
+ }
+ //鐪�+甯�
+ String address = addressbeip.Detailed_Address__c.trim();
+ String cityName = addressbeip.City_Name__c.trim();
+ String ProvinceCity = addressbeip.Province_Name__c.trim()+cityName;
+ //闃叉璇︾粏鍦板潃閲岄潰甯︾潃鐪佷唤鍜屽競
+ if(!address.contains(ProvinceCity)){
+ address = ProvinceCity + address;
+ }
+ //鑱旂郴浜�
+ String ContactPerson = '';
+ if(!String.isBlank(addressbeip.Customer__c)){
+ ContactPerson = addressbeip.Customer_Name__c;
+ }
+ nObj.address_Contacts__c=contactsName;
+ nObj.address_ZipCode__c = addressbeip.ZipCode__c;
+ nObj.address_City__c = cityName;
+ nObj.address_Contacts_Name__c = ContactPerson;
+ nObj.address_Telephone__c=addressbeip.Telephone__c;
+ nObj.Detailed_Address__c=address;
+ nObj.Encrypt_Update_Flag__c=true;
+ system.debug('nObj assign and Encrypt_Update_Flag__c set true');
+
+ }
+ }else{
+ if(nObj.Hospital__c != null && nObj.address_Contacts__c == null && nObj.address_Telephone__c == null && nObj.address_Contacts_Name__c == null && nObj.address_City__c == null && nObj.Detailed_Address__c == null){
+ //鐢变簬涓轰簡鍑忓皯select ,鎵�浠ヨ幏鍙栨垜浠厤缃ソ鐨刴ap锛屾牴鎹繚鏈夎澶囦笂鍖婚櫌鐨� OCSM绠＄悊鐪�(鏂囨湰) 鐨勫�硷紝鑾峰彇瀵瑰簲鐨勫湴鍧�涓婄殑鐪佸拰甯�
+ for(Account ac : accountList){
+ if(nObj.Hospital__c == ac.id){
+ String provinceAndCity = '';
+ matchupMap.get(ac.OCM_man_province_txt__c);
+ //DB202303246427 LY 20230329 start
+ // if('灞变笢' == ac.OCM_man_province_txt__c){
+ // if('鐑熷彴甯�' == ac.FieldCity_Master_Name__c || '濞佹捣甯�' == ac.FieldCity_Master_Name__c || '鏃ョ収甯�' == ac.FieldCity_Master_Name__c
+ // || '闈掑矝甯�' == ac.FieldCity_Master_Name__c || '娼嶅潑甯�' == ac.FieldCity_Master_Name__c){
+ // provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
+ // }else{
+ // provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ // }
+ if ('闈掑矝' == ac.OCM_man_province_txt__c) {
provinceAndCity = matchupMap.get('灞变笢,闈掑矝甯�');
- }else{
+ }else if ('灞变笢' == ac.OCM_man_province_txt__c) {
provinceAndCity = matchupMap.get('灞变笢,娴庡崡甯�');
+ //DB202303246427 LY 20230329 end
+ }else{
+ provinceAndCity = matchupMap.get(ac.OCM_man_province_txt__c);
}
- }else{
- provinceAndCity = matchupMap.get(ac.OCM_man_province_txt__c);
- }
- system.debug('provinceAndCity='+provinceAndCity);
- if(provinceAndCity != null){//涓嶈兘涓虹┖
- //鍦板潃琛ㄤ笂鐪佸拰甯備笉鑳戒负绌�
- if(addressList[0].Province_Name__c != null && addressList[0].City_Name__c!= null){
- //鎷兼帴涓�涓瓧绗︿覆鏂逛究瀵规瘮
- String pAc = addressList[0].Province_Name__c + ',' + addressList[0].City_Name__c;
- if(provinceAndCity.equals(pAc)){
- //鑱旂郴浜�
- String contactsName = '';
- String contactsNameEncrypt = '';// 20220407 PI鏀归�� By Bright
- if(!String.isBlank(addressList[0].Contacts__c)){
- contactsName = addressList[0].Contacts_Name__c;
- //contactsNameEncrypt = addressList[0].Contacts__r.LastName_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ system.debug('provinceAndCity='+provinceAndCity);
+ if(provinceAndCity != null){//涓嶈兘涓虹┖
+ //鍦板潃琛ㄤ笂鐪佸拰甯備笉鑳戒负绌�
+ if(addressList[0].Province_Name__c != null && addressList[0].City_Name__c!= null){
+ //鎷兼帴涓�涓瓧绗︿覆鏂逛究瀵规瘮
+ String pAc = addressList[0].Province_Name__c + ',' + addressList[0].City_Name__c;
+ if(provinceAndCity.equals(pAc)){
+ //鑱旂郴浜�
+ String contactsName = '';
+ String contactsNameEncrypt = '';// 20220407 PI鏀归�� By Bright
+ if(!String.isBlank(addressList[0].Contacts__c)){
+ contactsName = addressList[0].Contacts_Name__c;
+ //contactsNameEncrypt = addressList[0].Contacts__r.LastName_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ }
+ //鐪�+甯�
+ String address = addressList[0].Detailed_Address__c.trim();
+ //String addressEncrypt = addressList[0].Detailed_Address_Encrypted__c; zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ String cityName = addressList[0].City_Name__c.trim();
+ String ProvinceCity = addressList[0].Province_Name__c.trim()+cityName;
+ //闃叉璇︾粏鍦板潃閲岄潰甯︾潃鐪佷唤鍜屽競
+ if(!address.contains(ProvinceCity)){
+ address = ProvinceCity + address;
+ }
+ //鑱旂郴浜�
+ String ContactPerson = '';
+ if(!String.isBlank(addressList[0].Customer__c)){
+ ContactPerson = addressList[0].Customer_Name__c;
+ }
+ nObj.address_Contacts__c=contactsName;
+ //nObj.address_Contacts_Encrypt__c=contactsNameEncrypt;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ nObj.address_ZipCode__c = addressList[0].ZipCode__c;
+ //nObj.address_ZipCode_Encrypt__c = addressList[0].ZipCode_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ nObj.address_City__c = cityName;
+ nObj.address_Contacts_Name__c = ContactPerson;
+ nObj.address_Telephone__c=addressList[0].Telephone__c;
+ //nObj.address_Telephone_Encrypt__c=addressList[0].Telephone_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ nObj.Detailed_Address__c=address;
+ //nObj.Detailed_Address_Encrypt__c=addressEncrypt;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
+ nObj.Encrypt_Update_Flag__c=true;// 20220411 PI鏀归�� By Bright
+ system.debug('nObj assign and Encrypt_Update_Flag__c set true');
}
- //鐪�+甯�
- String address = addressList[0].Detailed_Address__c.trim();
- //String addressEncrypt = addressList[0].Detailed_Address_Encrypted__c; zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
- String cityName = addressList[0].City_Name__c.trim();
- String ProvinceCity = addressList[0].Province_Name__c.trim()+cityName;
- //闃叉璇︾粏鍦板潃閲岄潰甯︾潃鐪佷唤鍜屽競
- if(!address.contains(ProvinceCity)){
- address = ProvinceCity + address;
- }
- //鑱旂郴浜�
- String ContactPerson = '';
- if(!String.isBlank(addressList[0].Customer__c)){
- ContactPerson = addressList[0].Customer_Name__c;
- }
- nObj.address_Contacts__c=contactsName;
- //nObj.address_Contacts_Encrypt__c=contactsNameEncrypt;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
- nObj.address_ZipCode__c = addressList[0].ZipCode__c;
- //nObj.address_ZipCode_Encrypt__c = addressList[0].ZipCode_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
- nObj.address_City__c = cityName;
- nObj.address_Contacts_Name__c = ContactPerson;
- nObj.address_Telephone__c=addressList[0].Telephone__c;
- //nObj.address_Telephone_Encrypt__c=addressList[0].Telephone_Encrypted__c;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
- nObj.Detailed_Address__c=address;
- //nObj.Detailed_Address_Encrypt__c=addressEncrypt;// 20220407 PI鏀归�� By Bright zhj MEBG鏂版柟妗堟敼閫� 2022-11-29
- nObj.Encrypt_Update_Flag__c=true;// 20220411 PI鏀归�� By Bright
- system.debug('nObj assign and Encrypt_Update_Flag__c set true');
}
}
}
}
}
}
+
}
}
}
diff --git a/force-app/main/default/classes/SetProvinceTargetController.cls b/force-app/main/default/classes/SetProvinceTargetController.cls
index 028d11c..d7b55f0 100644
--- a/force-app/main/default/classes/SetProvinceTargetController.cls
+++ b/force-app/main/default/classes/SetProvinceTargetController.cls
@@ -653,7 +653,7 @@
//20210225 ljh WLIG-BV8CHF update 璐㈠勾 end
isPast = false;
if (iYear < currentYear) {
- isPast = true;
+ isPast = true;
} else if (iYear == currentYear) {
if (Date.today().month() == 3) {
isPast = true;
@@ -998,7 +998,10 @@
List<OCM_Management_Province__c> OCM_MpList = [select Id,Province__c,GI_assistant__c,SP_assistant__c,Name from OCM_Management_Province__c where Province__c in :AllOwnerSystem ];
for ( OCM_Management_Province__c OCM_Mp : OCM_MpList ) {
//杩囨护鎺変笉绗﹀悎鏉′欢鐨勬暟鎹� fy
- if(OCM_Mp.Name!='闆嗛噰璇�'&&OCM_Mp.Name!='闈掑矝'){
+ // 20230329 ljh start
+ // if(OCM_Mp.Name!='闆嗛噰璇�'&&OCM_Mp.Name!='闈掑矝'){
+ if(OCM_Mp.Name!='闆嗛噰璇�'){
+ // 20230329 ljh end
OCM_MpMap.put(OCM_Mp.Province__c, OCM_Mp);
}
}
diff --git a/force-app/main/default/classes/StartTradingController.cls b/force-app/main/default/classes/StartTradingController.cls
index e1f46d5..46a4b4b 100644
--- a/force-app/main/default/classes/StartTradingController.cls
+++ b/force-app/main/default/classes/StartTradingController.cls
@@ -83,6 +83,7 @@
Tender_information__c, Agency_Opportunity__c, SI_PromoteInquiry__c
, Contact_Name__r.AccountId //2022-6-20 yjk 澧炲姞鑱旂郴浜虹殑绉戝鏌ヨ
,ET_Check__c //SWAG-CKDATG fy 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1
+ ,Hospital_Name__r.Parent.Parent.OCM_man_province_HP__c //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� add
from Lead where id =: this.leadId];
this.SI_Flg = this.lead.SI_PromoteInquiry__c;
// 瑷虹檪绉戦伕鎶炪儶銈广儓銇彇寰楋紙鏉′欢锛氱梾闄�=銉兗銉夋儏鍫便伄鐥呴櫌鍚嶇О锛�
@@ -402,7 +403,50 @@
//**********************************************************************************
opp.Sales_Method__c = this.lead.Sales_Method__c;
opp.Fund_Basis__c = this.lead.Fund_Basis__c;
- opp.SAP_Province__c = this.leadOnwer.Province_Text__c;
+ //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� start
+ // opp.SAP_Province__c = this.leadOnwer.Province_Text__c;
+ System.debug('lt123---this.lead.Hospital_Name__r.Parent.Parent.OCM_man_province_HP__c:'+this.lead.Hospital_Name__r.Parent.Parent.OCM_man_province_HP__c);
+ Map<String,String> SAP_ProvinceMap = new Map<String,String>();
+ SAP_ProvinceMap.put('瀹佸','瀹佸鑷不鍖�');
+ SAP_ProvinceMap.put('鏂扮枂','鏂扮枂鑷不鍖�');
+ SAP_ProvinceMap.put('榛戦緳姹�','榛戦緳姹熺渷');
+ SAP_ProvinceMap.put('骞胯タ','骞胯タ鑷不鍖�');
+ SAP_ProvinceMap.put('澶ц繛','澶ц繛甯�');
+ SAP_ProvinceMap.put('娌堥槼','杈藉畞鐪�'); //鏆傛椂杈藉畞
+ SAP_ProvinceMap.put('骞夸笢','骞夸笢鐪�');
+ SAP_ProvinceMap.put('娣卞湷','娣卞湷甯�');
+ SAP_ProvinceMap.put('闈掑矝','闈掑矝甯�');
+ SAP_ProvinceMap.put('灞变笢','灞变笢鐪�');
+ SAP_ProvinceMap.put('鍥涘窛/瑗胯棌','鍥涘窛鐪�');
+ SAP_ProvinceMap.put('瀹夊窘','瀹夊窘鐪�');
+ SAP_ProvinceMap.put('鍖椾含','鍖椾含甯�');
+ SAP_ProvinceMap.put('绂忓缓','绂忓缓鐪�');
+ SAP_ProvinceMap.put('鐢樿們','鐢樿們鐪�');
+ SAP_ProvinceMap.put('璐靛窞','璐靛窞鐪�');
+ SAP_ProvinceMap.put('娌冲寳','娌冲寳鐪�');
+ SAP_ProvinceMap.put('娌冲崡','娌冲崡鐪�');
+ SAP_ProvinceMap.put('婀栧寳','婀栧寳鐪�');
+ SAP_ProvinceMap.put('婀栧崡','婀栧崡鐪�');
+ SAP_ProvinceMap.put('鍚夋灄','鍚夋灄鐪�');
+ SAP_ProvinceMap.put('姹熻嫃','姹熻嫃鐪�');
+ SAP_ProvinceMap.put('姹熻タ','姹熻タ鐪�');
+ SAP_ProvinceMap.put('闈掓捣','闈掓捣鐪�');
+ SAP_ProvinceMap.put('灞辫タ','灞辫タ鐪�');
+ SAP_ProvinceMap.put('闄曡タ','闄曡タ鐪�');
+ SAP_ProvinceMap.put('涓婃捣','涓婃捣甯�');
+ SAP_ProvinceMap.put('澶╂触','澶╂触甯�');
+ SAP_ProvinceMap.put('浜戝崡','浜戝崡鐪�');
+ SAP_ProvinceMap.put('娴欐睙','娴欐睙鐪�');
+ SAP_ProvinceMap.put('閲嶅簡','閲嶅簡甯�');
+ SAP_ProvinceMap.put('娴峰崡','娴峰崡鐪�');
+ //鍐呰挋鍙や竴鑷�
+
+ String SAP_Province = this.lead.Hospital_Name__r.Parent.Parent.OCM_man_province_HP__c;
+ if(SAP_ProvinceMap.containsKey(SAP_Province)){
+ SAP_Province = SAP_ProvinceMap.get(SAP_Province);
+ }
+ opp.SAP_Province__c = SAP_Province;
+ //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� end
opp.Owner_System__c = opp.OwnerId;
if(this.lead.OwnerId != null ){
opp.Ownerid = this.lead.OwnerId ;
diff --git a/force-app/main/default/classes/TenderLostController.cls b/force-app/main/default/classes/TenderLostController.cls
index c9a4886..040f574 100644
--- a/force-app/main/default/classes/TenderLostController.cls
+++ b/force-app/main/default/classes/TenderLostController.cls
@@ -56,7 +56,9 @@
System.debug('lt123test01榛樿璇环鍐呭'+opp);
// 鏌ユ壘绉戝鐩稿叧淇℃伅
- Account acc = [select Id, Name, Parent.Parent.State_Master__r.Name, Parent.Department_Class_Label__c from Account where Id = :opp.AccountId];
+ Account acc = [select Id, Name, Parent.Parent.State_Master__r.Name, Parent.Department_Class_Label__c
+ ,Parent.Parent.OCM_man_province_HP__c //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� add
+ from Account where Id = :opp.AccountId];
System.debug('lt123test02榛樿璇环鍐呭'+opp);
// 20221205 ljh DB202212030068 start
@@ -66,12 +68,49 @@
鏂扮枂缁村惥灏旇嚜娌诲尯--->鏂扮枂鑷不鍖�
榛戦緳姹�--->榛戦緳姹熺渷*/
// opp.SAP_Province__c = acc.Parent.Parent.State_Master__r.Name; // SAP涓婁紶鐪�
+ //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� start
Map<String,String> SAP_ProvinceMap = new Map<String,String>();
- SAP_ProvinceMap.put('鍐呰挋鍙よ嚜娌诲尯','鍐呰挋鍙�');
- SAP_ProvinceMap.put('瀹佸鍥炴棌鑷不鍖�','瀹佸鑷不鍖�');
- SAP_ProvinceMap.put('鏂扮枂缁村惥灏旇嚜娌诲尯','鏂扮枂鑷不鍖�');
+ // SAP_ProvinceMap.put('鍐呰挋鍙よ嚜娌诲尯','鍐呰挋鍙�');
+ // SAP_ProvinceMap.put('瀹佸鍥炴棌鑷不鍖�','瀹佸鑷不鍖�');
+ // SAP_ProvinceMap.put('鏂扮枂缁村惥灏旇嚜娌诲尯','鏂扮枂鑷不鍖�');
+ // SAP_ProvinceMap.put('榛戦緳姹�','榛戦緳姹熺渷');
+ SAP_ProvinceMap.put('瀹佸','瀹佸鑷不鍖�');
+ SAP_ProvinceMap.put('鏂扮枂','鏂扮枂鑷不鍖�');
SAP_ProvinceMap.put('榛戦緳姹�','榛戦緳姹熺渷');
- String SAP_Province = acc.Parent.Parent.State_Master__r.Name;
+ SAP_ProvinceMap.put('骞胯タ','骞胯タ鑷不鍖�');
+ SAP_ProvinceMap.put('澶ц繛','澶ц繛甯�');
+ SAP_ProvinceMap.put('娌堥槼','杈藉畞鐪�'); //鏆傚畾杈藉畞
+ SAP_ProvinceMap.put('骞夸笢','骞夸笢鐪�');
+ SAP_ProvinceMap.put('娣卞湷','娣卞湷甯�');
+ SAP_ProvinceMap.put('闈掑矝','闈掑矝甯�');
+ SAP_ProvinceMap.put('灞变笢','灞变笢鐪�');
+ SAP_ProvinceMap.put('鍥涘窛/瑗胯棌','鍥涘窛鐪�');
+ SAP_ProvinceMap.put('瀹夊窘','瀹夊窘鐪�');
+ SAP_ProvinceMap.put('鍖椾含','鍖椾含甯�');
+ SAP_ProvinceMap.put('绂忓缓','绂忓缓鐪�');
+ SAP_ProvinceMap.put('鐢樿們','鐢樿們鐪�');
+ SAP_ProvinceMap.put('璐靛窞','璐靛窞鐪�');
+ SAP_ProvinceMap.put('娌冲寳','娌冲寳鐪�');
+ SAP_ProvinceMap.put('娌冲崡','娌冲崡鐪�');
+ SAP_ProvinceMap.put('婀栧寳','婀栧寳鐪�');
+ SAP_ProvinceMap.put('婀栧崡','婀栧崡鐪�');
+ SAP_ProvinceMap.put('鍚夋灄','鍚夋灄鐪�');
+ SAP_ProvinceMap.put('姹熻嫃','姹熻嫃鐪�');
+ SAP_ProvinceMap.put('姹熻タ','姹熻タ鐪�');
+ SAP_ProvinceMap.put('闈掓捣','闈掓捣鐪�');
+ SAP_ProvinceMap.put('灞辫タ','灞辫タ鐪�');
+ SAP_ProvinceMap.put('闄曡タ','闄曡タ鐪�');
+ SAP_ProvinceMap.put('涓婃捣','涓婃捣甯�');
+ SAP_ProvinceMap.put('澶╂触','澶╂触甯�');
+ SAP_ProvinceMap.put('浜戝崡','浜戝崡鐪�');
+ SAP_ProvinceMap.put('娴欐睙','娴欐睙鐪�');
+ SAP_ProvinceMap.put('閲嶅簡','閲嶅簡甯�');
+ SAP_ProvinceMap.put('娴峰崡','娴峰崡鐪�');
+ //鍐呰挋鍙や竴鑷�
+
+ // String SAP_Province = acc.Parent.Parent.State_Master__r.Name;
+ String SAP_Province = acc.Parent.Parent.OCM_man_province_HP__c;
+ //20230329 lt DB202303246427 --闈掑矝鎷嗗垎 -- 鏍规嵁璇⑩�滅渷锛堝鎴凤級鈥濊祴鍊糞AP涓婁紶鐪� end
if(SAP_ProvinceMap.containsKey(SAP_Province)){
SAP_Province = SAP_ProvinceMap.get(SAP_Province);
}
--
Gitblit v1.9.1