From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/ControllerUtil.cls | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 200 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/classes/ControllerUtil.cls b/force-app/main/default/classes/ControllerUtil.cls
index d0c4acd..a70f2f2 100644
--- a/force-app/main/default/classes/ControllerUtil.cls
+++ b/force-app/main/default/classes/ControllerUtil.cls
@@ -2918,7 +2918,7 @@
Map<String, Contact> conMap = new Map<String, Contact>();
// UserToContact 銇� 澶夋洿銇椼仧銇� 銇仸鍒ゆ柇銇椼仧闋呯洰銇с仚
//20220425 LLIU-CCY9TA you 鏌ヨpost鐨勫湴鏂规崲鎴� HR_Post__c
- List<User> usrList = [select Id,PositionSubsequence__c, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, HR_Post__c,Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c, Work_Location_HR__c from User where Employee_No__c IN :userEmployeeNoList];
+ List<User> usrList = [select Id,PositionSubsequence__c,Rank__c, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, HR_Post__c,Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c, Work_Location_HR__c from User where Employee_No__c IN :userEmployeeNoList];
List<Contact> conList = [select Id,Notes_File_Name__c, User__c, Employee_No_manual__c,Isactive__c,IsMEBG__c, Work_Location_HR__c from Contact where Employee_No_manual__c IN :userEmployeeNoList and RecordTypeId = :rtId];
for (Contact con : conList) {
//conMap.put(con.Employee_No_manual__c, con);
@@ -2971,9 +2971,12 @@
//20220428 LLIU-CDW5ZW you start
tmp.PositionSubsequence__c = local.PositionSubsequence__c;
//20220428 LLIU-CDW5ZW you end
+ //20220512 you LLIU-CDW5ZW start
+ tmp.Rank__c = local.Rank__c;
+ //20220428 you LLIU-CDW5ZW end
if(String.isNotBlank(local.Stay_or_not__c)){
- tmp.Isactive__c = local.Stay_or_not__c == '鍦ㄨ亴' ? '鏈夋晥':'鏃犳晥';
+ tmp.Isactive__c = local.Stay_or_not__c == '鍦ㄨ亴' ? '鏈夋晥':'鏃犳晥(閫�浼�)';
}
upsertList.add(tmp);
system.debug('youchangtest2'+tmp.HR_Post__c);
@@ -3007,8 +3010,11 @@
//20220428 LLIU-CDW5ZW you start
tmp.PositionSubsequence__c = local.PositionSubsequence__c;
//20220428 LLIU-CDW5ZW you end
+ //20220512 you LLIU-CDW5ZW start
+ tmp.Rank__c = local.Rank__c;
+ //20220428 you LLIU-CDW5ZW end
if(String.isNotBlank(local.Stay_or_not__c)){
- tmp.Isactive__c = '鍦ㄨ亴'.equals(local.Stay_or_not__c) ? '鏈夋晥':'鏃犳晥';
+ tmp.Isactive__c = '鍦ㄨ亴'.equals(local.Stay_or_not__c) ? '鏈夋晥':'鏃犳晥(閫�浼�)';
}
upsertList.add(tmp);
system.debug('youchangtest3'+tmp.HR_Post__c);
@@ -3077,6 +3083,43 @@
}
}
//20220426 LLIU-CCY9TA you end
+
+ //20220721 you LLIU-CGH8EY start 鏈儴鍒嗙被-宀椾綅瀛愬簭鍒楋紝鏄犲皠 user涓婄殑鑱岀
+ SS_BatchColumnMapping__c JobmpdMapping = SS_BatchColumnMapping__c.getValues('HR_Post_To_Job_Category__c');
+
+ Map<String,String> Job_CategoryMap = new Map<String,String>();
+ for (Integer i = 1; i <= 30; i++) {
+ String lpadI = ('00' + i).right(3);
+ String fromColumn = 'From_Column_' + lpadI + '__c';
+ if(JobmpdMapping!=null){
+ String apiStr = String.valueOf(JobmpdMapping.get(fromColumn));
+ if (String.isBlank(apiStr) == false) {
+ String ssColumn = 'SS_Column_' + lpadI + '__c';
+ String ssApiStr = String.valueOf(JobmpdMapping.get(ssColumn));
+ Job_CategoryMap.put(apiStr,ssApiStr);
+ }
+ }
+ }
+ //20220721 you LLIU-CGH8EY end
+
+ //20220823 you LLIU-CHL8FB start 鏈儴鏄�--solution鏈儴鐨勯�氳繃鏄犲皠锛屾洿鏂扮敤鎴蜂笂鐨� 鏈儴(閫夐」)锛屽鏋滄槸鍏朵粬锛岄偅涔堟甯歌蛋閫昏緫
+ SS_BatchColumnMapping__c DeptMapping = SS_BatchColumnMapping__c.getValues('HR_Category4_To_Dept__c');
+
+ Map<String,String> DeptMap = new Map<String,String>();
+ for (Integer i = 1; i <= 30; i++) {
+ String lpadI = ('00' + i).right(3);
+ String fromColumn = 'From_Column_' + lpadI + '__c';
+ if(DeptMapping!=null){
+ String apiStr = String.valueOf(DeptMapping.get(fromColumn));
+ if (String.isBlank(apiStr) == false) {
+ String ssColumn = 'SS_Column_' + lpadI + '__c';
+ String ssApiStr = String.valueOf(DeptMapping.get(ssColumn));
+ DeptMap.put(apiStr,ssApiStr);
+ }
+ }
+ }
+ //20220823 you LLIU-CHL8FB end
+
system.debug(mpdMapping+'==UserAndContactMap=='+UserAndContactMap);
//鑾峰彇鑷畾涔夋爣绛撅紝鑷繁瀹氫箟锛岀敤鏉ョ┖鏇存柊鏁版嵁鎴栧鐞嗗巻鍙叉暟鎹�
//鍦ㄥ鐞嗗巻鍙茶褰曟椂锛氳亴浣嶅拰鑱岀 濡傛灉ods鐨勫�间负绌猴紝閭ｄ箞user瀵硅薄鐨勮繖涓や釜瀛楁灏变笉闇�瑕佹洿鏂�
@@ -3084,7 +3127,7 @@
// 鐜版湁鐢ㄦ埛
Map<String, User> usrMap = new Map<String, User>();
// ContactToUser 銇� 澶夋洿銇椼仧銇� 銇仸鍒ゆ柇銇椼仧闋呯洰銇с仚
- List<ODS__c> conList = [select id,Alias__c,Branch__c,PositionSubsequence__c,Category3__c,Category4__c,Category5__c,Category6__c,Employee_No__c,Hire_Date__c,FirstName__c,LastName__c,Name__c,Email__c,MobilePhone__c,Post__c,Job_Category__c,Job_Type__c,Product_specialist_incharge_product__c,Sales_Speciality__c,Work_Location__c,Stay_or_not__c,LeaveDate__c,UniqueId__c,Null_Update__c from ODS__c where Employee_No__c in :userEmployeeNoList];
+ List<ODS__c> conList = [select id,Alias__c,Branch__c,PositionSubsequence__c,Rank__c,Category3__c,Category4__c,Category5__c,Category6__c,Employee_No__c,Hire_Date__c,FirstName__c,LastName__c,Name__c,Email__c,MobilePhone__c,Post__c,Job_Category__c,Job_Type__c,Product_specialist_incharge_product__c,Sales_Speciality__c,Work_Location__c,Stay_or_not__c,LeaveDate__c,UniqueId__c,Null_Update__c,Salesdepartment__c from ODS__c where Employee_No__c in :userEmployeeNoList];
List<User> usrList = [select Id, PBI_Enable__c ,PBIAuthorizedSetting__c,Employee_No__c from User where Employee_No__c IN :userEmployeeNoList];
for (User usr : usrList) {
@@ -3106,7 +3149,13 @@
userData.Group_sales_dept__c = odsc.Category3__c;//缁熸嫭鏈儴
if(String.isNotBlank(odsc.Category4__c)){
- userData.Dept__c = odsc.Category4__c;//鏈儴
+ //20220823 you LLIU-CHL8FB start
+ if(null!=DeptMap && DeptMap.containsKey(odsc.Category4__c)){
+ userData.Dept__c = DeptMap.get(odsc.Category4__c);//鏈儴
+ }else{
+ userData.Dept__c = odsc.Category4__c;//鏈儴
+ }
+ //20220823 you LLIU-CHL8FB end
}
userData.Category5__c = odsc.Category5__c;//閮�
//LLIU-CCS8ZB-褰撴柊鍒涘缓鐨勬椂鍊欐帴鏀朵汉浜嬩俊鎭腑鐨勮淇℃伅锛屼箣鍚庝笉杩涜鏇存柊 thh 20220324 start
@@ -3132,7 +3181,12 @@
//20220428 LLIU-CDW5ZW you start
userData.PositionSubsequence__c = odsc.PositionSubsequence__c;
//20220428 LLIU-CDW5ZW you end
+ //20220512 you LLIU-CDW5ZW start
+ userData.Rank__c = odsc.Rank__c;
+ //20220428 you LLIU-CDW5ZW end
+ // 20220721 you LLIU-CGH8EY start 娉ㄩ噴锛屼緷鎹湰閮ㄥ拰宀椾綅瀛愬簭鍒� 缁欒亴绉嶈祴鍊�
+ /**
String zz = '';
if(odsc.Job_Category__c == '鏈嶅姟'){
zz = '閿�鍞湇鍔�';
@@ -3144,7 +3198,52 @@
//濡傛灉鑷畾涔夊彉杩佺殑鍊间负1锛岄偅涔堣瘉鏄庣幇鍦ㄦ槸鍦ㄥ鐞嗗巻鍙叉暟鎹紝鑰屽巻鍙叉暟鎹瀹氾紝濡傛灉ods鐨勮亴绉嶄负绌猴紝閭ｄ箞灏变笉闇�瑕佹洿鏂皍ser鐨勮亴绉�
if(String.isNotBlank(zz) || buffer != 1){
userData.Job_Category__c = zz;//鑱岀
- }
+ }**/
+ String bbz=odsc.Category4__c+'-' +odsc.PositionSubsequence__c; //鏈儴-宀椾綅瀛愬簭鍒�
+ String ldbb=odsc.Salesdepartment__c+'-' +odsc.PositionSubsequence__c; //鍏ぇ鏈儴-宀椾綅瀛愬簭鍒�
+ String bbz1=odsc.Category5__c+'-' +odsc.PositionSubsequence__c; //閮�-宀椾綅瀛愬簭鍒�
+ system.debug(bbz+'==='+ldbb+'==Job_CategoryMap=='+Job_CategoryMap);
+ //鏈儴涓嶇瓑浜庣┖锛岀湅鏈儴
+ String zz = '';
+ if( (String.isNotBlank(odsc.PositionSubsequence__c) && odsc.PositionSubsequence__c=='渚涘簲閾剧鐞�') || ( String.isNotBlank(odsc.Category4__c) && odsc.Category4__c=='鎴樼暐鍒涙柊鏈儴')){
+ zz = '绠＄悊';
+ }else if( String.isNotBlank(odsc.Category4__c) && odsc.Category4__c=='Solution鏈儴'){
+ zz = '甯傚満';
+ }else if(String.isNotBlank(odsc.Category4__c)){
+ if(null!=Job_CategoryMap && Job_CategoryMap.containsKey(bbz)){
+ if(Job_CategoryMap.get(bbz) == '鏈嶅姟'){
+ zz = '閿�鍞湇鍔�';
+ }else if(Job_CategoryMap.get(bbz) == '鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }else{
+ zz = Job_CategoryMap.get(bbz);
+ }
+ }
+ if(null!=Job_CategoryMap && Job_CategoryMap.containsKey(ldbb)){
+ if(Job_CategoryMap.get(ldbb) == '鏈嶅姟'){
+ zz = '閿�鍞湇鍔�';
+ }else if(Job_CategoryMap.get(ldbb) == '鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }else{
+ zz = Job_CategoryMap.get(ldbb);
+ }
+ }
+
+ system.debug('=='+Job_CategoryMap.get(bbz)+'==='+Job_CategoryMap.get(ldbb)+'==='+zz);
+ }else if(String.isBlank(odsc.Category4__c) && String.isNotBlank(odsc.Category5__c)){
+ //鏈儴绛変簬绌猴紝鐪嬮儴
+ if(odsc.Category5__c=='鍗庡寳涓滃寳杩愯惀绠＄悊閮�' || odsc.Category5__c=='瑗垮寳瑗垮崡杩愯惀绠＄悊閮�' || odsc.Category5__c=='瑗垮寳瑗垮崡杩愯惀鏀彺閮�' || bbz1=='鍗庡寳涓滃寳鏈嶅姟閮�-缁煎悎琛屾斂' || bbz1=='鍗庡寳涓滃寳甯傚満閮�-缁煎悎琛屾斂'){
+ zz = '鏀彺';
+ }else if(bbz1=='鍗庡寳涓滃寳鏈嶅姟閮�-FSE'){
+ zz = '閿�鍞湇鍔�';
+ }else if(odsc.Category5__c=='瑗块儴鎴樼暐鎺ㄨ繘閮�' || bbz1=='鍗庡寳涓滃寳甯傚満閮�-鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }
+ }
+ userData.Job_Category__c = zz;
+
+ // 20220721 you LLIU-CGH8EY end
+
//userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//璐熻矗浜у搧锛堜富锛�
//userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//閿�鍞伐浣滃唴瀹�
//HR淇℃伅涓婄殑宸ヤ綔鍦版洿鏂板埌鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級涓� thh 2022-02-16 start
@@ -3165,7 +3264,13 @@
User userData = new User();
userData.Group_sales_dept__c = odsc.Category3__c;//缁熸嫭鏈儴
if(String.isNotBlank(odsc.Category4__c)){
- userData.Dept__c = odsc.Category4__c;//鏈儴
+ //20220823 you LLIU-CHL8FB start
+ if(null!=DeptMap && DeptMap.containsKey(odsc.Category4__c)){
+ userData.Dept__c = DeptMap.get(odsc.Category4__c);//鏈儴
+ }else{
+ userData.Dept__c = odsc.Category4__c;//鏈儴
+ }
+ //20220823 you LLIU-CHL8FB end
}
userData.Category5__c = odsc.Category5__c;//閮�
userData.Category6__c = odsc.Category6__c;//璇�
@@ -3188,6 +3293,11 @@
//20220428 LLIU-CDW5ZW you start
userData.PositionSubsequence__c = odsc.PositionSubsequence__c;
//20220428 LLIU-CDW5ZW you end
+ //20220512 you LLIU-CDW5ZW start
+ userData.Rank__c = odsc.Rank__c;
+ //20220428 you LLIU-CDW5ZW end
+ // 20220721 you LLIU-CGH8EY start 娉ㄩ噴锛屼緷鎹湰閮ㄥ拰宀椾綅瀛愬簭鍒� 缁欒亴绉嶈祴鍊�
+ /**
String zz = '';
if(odsc.Job_Category__c == '鏈嶅姟'){
zz = '閿�鍞湇鍔�';
@@ -3199,7 +3309,49 @@
//濡傛灉鑷畾涔夊彉杩佺殑鍊间负1锛岄偅涔堣瘉鏄庣幇鍦ㄦ槸鍦ㄥ鐞嗗巻鍙叉暟鎹紝鑰屽巻鍙叉暟鎹瀹氾紝濡傛灉ods鐨勮亴绉嶄负绌猴紝閭ｄ箞灏变笉闇�瑕佹洿鏂皍ser鐨勮亴绉�
if(String.isNotBlank(zz) || buffer != 1){
userData.Job_Category__c = zz;//鑱岀
- }
+ }**/
+ String bbz=odsc.Category4__c+'-' +odsc.PositionSubsequence__c; //鏈儴-宀椾綅瀛愬簭鍒�
+ String ldbb=odsc.Salesdepartment__c+'-' +odsc.PositionSubsequence__c; //鍏ぇ鏈儴-宀椾綅瀛愬簭鍒�
+ String bbz1=odsc.Category5__c+'-' +odsc.PositionSubsequence__c; //閮�-宀椾綅瀛愬簭鍒�
+ //鏈儴涓嶇瓑浜庣┖锛岀湅鏈儴
+ String zz = '';
+ if( (String.isNotBlank(odsc.PositionSubsequence__c) && odsc.PositionSubsequence__c=='渚涘簲閾剧鐞�') || ( String.isNotBlank(odsc.Category4__c) && odsc.Category4__c=='鎴樼暐鍒涙柊鏈儴')){
+ zz = '绠＄悊';
+ }else if( String.isNotBlank(odsc.Category4__c) && odsc.Category4__c=='Solution鏈儴'){
+ zz = '甯傚満';
+ }else if(String.isNotBlank(odsc.Category4__c)){
+ if(null!=Job_CategoryMap && Job_CategoryMap.containsKey(bbz)){
+ if(Job_CategoryMap.get(bbz) == '鏈嶅姟'){
+ zz = '閿�鍞湇鍔�';
+ }else if(Job_CategoryMap.get(bbz) == '鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }else{
+ zz = Job_CategoryMap.get(bbz);
+ }
+ }
+ if(null!=Job_CategoryMap && Job_CategoryMap.containsKey(ldbb)){
+ if(Job_CategoryMap.get(ldbb) == '鏈嶅姟'){
+ zz = '閿�鍞湇鍔�';
+ }else if(Job_CategoryMap.get(ldbb) == '鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }else{
+ zz = Job_CategoryMap.get(ldbb);
+ }
+ }
+
+ }else if(String.isBlank(odsc.Category4__c) && String.isNotBlank(odsc.Category5__c)){
+ //鏈儴绛変簬绌猴紝鐪嬮儴 LLIU-CKE3UG 澧炲姞鏄犲皠鍏崇郴
+ if(odsc.Category5__c=='鍗庡寳涓滃寳杩愯惀绠＄悊閮�' || odsc.Category5__c=='瑗垮寳瑗垮崡杩愯惀绠＄悊閮�' || odsc.Category5__c=='瑗垮寳瑗垮崡杩愯惀鏀彺閮�' || bbz1=='鍗庡寳涓滃寳鏈嶅姟閮�-缁煎悎琛屾斂' || bbz1=='鍗庡寳涓滃寳甯傚満閮�-缁煎悎琛屾斂'){
+ zz = '鏀彺';
+ }else if(bbz1=='鍗庡寳涓滃寳鏈嶅姟閮�-FSE'){
+ zz = '閿�鍞湇鍔�';
+ }else if(odsc.Category5__c=='瑗块儴鎴樼暐鎺ㄨ繘閮�' || bbz1=='鍗庡寳涓滃寳甯傚満閮�-鎺ㄥ箍'){
+ zz = '閿�鍞帹骞�';
+ }
+ }
+ userData.Job_Category__c = zz;
+
+ // 20220721 you LLIU-CGH8EY end
userData.Null_Update__c = odsc.Null_Update__c;
userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//璐熻矗浜у搧锛堜富锛�
userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//閿�鍞伐浣滃唴瀹�
@@ -4519,7 +4671,7 @@
,eventStatus__c, CancelReason__c, delayToDate__c, delayReason__c,DurationInMinutes__c,cancelReasonSelect__c,cancelReasonSelectFSE__c,cancelReasonOther__c,delayReasonOther__c,delayReasonSelect__c,delayReasonSelectFSE__c,BeforeActivityDate__c,OPDPlan_Flag__c,IsScheduled__c,AppCdId__c,SyncCreatedDate__c
// 20200420 浠诲姟鏃ユ姤绠＄悊 add gzw end
- ,OPD_plan__c // 2022-4-14 yjk 澧炲姞OPD璁″垝
+ //,OPD_plan__c // 2022-4-14 yjk 澧炲姞OPD璁″垝
from Event__c where ActivityDate__c =:whereDate and Daily_Report__c = :oya.Id order by StartDateTime__c
];
}
@@ -5229,12 +5381,7 @@
Discount_Amount_F__c,
Discount_Amount_Calculate_F__c,
BidAnnounce__c,
- Quote_No_last2__c,
- // 2022-03-21 SWAG-CBX5NN start
- multiYearWarranty__c,
- MultiYearWarrantyTotalPrice__c
- // 2022-03-21 SWAG-CBX5NN end
-
+ Quote_No_last2__c
FROM
Quote
WHERE
@@ -5640,4 +5787,42 @@
public static void lostOrder(Lost_Report__c lostData) {
upsert lostData;
}
+
+ // FY23淇敼 WLIG-CFV4AV 閲嶇偣浜у搧缁存姢锛堟柊锛塻tart
+ public static String getKeyByProduct(String keyword) {
+ if (String.isBlank(keyword)) {
+ return null;
+ }
+ String KeyProductMapping = System.Label.Key_Product_Mapping;
+ Map<String, Object> mapping = (Map<String, Object>) JSON.deserializeUntyped(KeyProductMapping);
+ System.debug('==Mapping is: ' + mapping);
+
+ return mapping.get(keyword) != null ? String.valueOf(mapping.get(keyword)) : null;
+ }
+ // FY23淇敼 WLIG-CFV4AV 閲嶇偣浜у搧缁存姢锛堟柊锛塭nd
+
+ //20221021 lt SWAG-CHL5XA銆怓Y23璇环鏀瑰杽銆�-缁熻涓绘満鍙版暟 start
+ public static void UpdateBiddingFlag(List<String> oppId){
+ List<Tender_Opportunity_Link__c> links = [SELECT Id, Tender_information__c, Tender_information__r.IsReactionOpp__c, Opportunity__c
+ FROM Tender_Opportunity_Link__c
+ WHERE Opportunity__c in :oppId ];
+
+ Map<String,Tender_information__c> tenderMap = new Map<String,Tender_information__c>();
+
+ for (Tender_Opportunity_Link__c link : links){
+
+ Tender_information__c temptender = new Tender_information__c();
+ temptender.Id = link.Tender_information__c;
+ temptender.IsReactionOpp__c = true;
+ tenderMap.put(temptender.id ,temptender);
+
+ }
+
+ if(tenderMap.size()>0){
+ update tenderMap.values();
+ }
+
+ }
+ //20221021 lt SWAG-CHL5XA銆怓Y23璇环鏀瑰杽銆�-缁熻涓绘満鍙版暟 end
+
}
\ No newline at end of file
--
Gitblit v1.9.1