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/SimpleEventRegisterController.cls | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/SimpleEventRegisterController.cls b/force-app/main/default/classes/SimpleEventRegisterController.cls
index dff5a34..a1d96c7 100644
--- a/force-app/main/default/classes/SimpleEventRegisterController.cls
+++ b/force-app/main/default/classes/SimpleEventRegisterController.cls
@@ -650,7 +650,7 @@
//2021-11-26 mzy 浠诲姟绠＄悊鏀瑰杽 start
//濡傛灉鏄笂绾у垎閰嶇殑浠诲姟,鍒欐嫓璁挎棩鏈熶笉鑳借秴杩囧笇鏈涘畬鎴愭棩
- if(task != null &&'涓婄骇鍒嗛厤浠诲姟'.equals(task.taskDifferent__c)&&task.HopeCompletionDate__c!=null&&targetEvent.StartDateTime.date()>task.HopeCompletionDate__c){
+ if(task != null &&'涓婄骇鍒嗛厤浠诲姟'.equals(task.taskDifferent__c)&&task.HopeCompletionDate__c!=null&&targetEvent.StartDateTime.date()>task.HopeCompletionDate__c&& task.HopeCompletionDate__c > Date.today()){
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鎺ユ敹浠诲姟鏃�,涓婄骇鍒嗛厤鐨勪换鍔℃嫓璁挎棩鏈熶笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+String.valueOf(task.HopeCompletionDate__c)+')'));
isError = true;
}
@@ -948,7 +948,9 @@
delayTask.GeneratePlan__c = true; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 start
delayTask.ConfirmDate__c = Date.today(); //鎺ュ彈鏃堕棿
delayTask.Activity_Date__c = targetEvent.StartDateTime.date(); //鎷滆鏃ユ湡 20201105 zh CHAN-BUV2TF
- delayTask.account__c = this.targetEvent.whatid__c; //瀹㈡埛
+ if(null != this.targetEvent.whatid__c && !''.equals(this.targetEvent.whatid__c)){//2022-4-24 yjk 澧炲姞闈炵┖楠岃瘉
+ delayTask.account__c = this.targetEvent.whatid__c; //瀹㈡埛
+ }
System.debug(this.targetEvent.whatid__c + '======');
// delayTask.Name = UserInfo.getName()+' 娴嬭瘯浠诲姟 '+delayTask.taskStatus__c;
delayTask.Name = task.Name;
@@ -1038,9 +1040,11 @@
}
}
+
//20201123 zh 鍒涘缓涓诲姩浠诲姟涓庣淮淇悎鍚屽叧鑱� end
if (LoginUser.Job_Category__c.equals('閿�鍞帹骞�')) {
if (this.targetEvent.Activity_Type2__c == '鐥呴櫌') {
+
// 2021-06-11 mzy sla 娉ㄩ噴鎺変簡璇环3 鍥犱负鐜板湪鐨勯〉闈㈡病鏈夌粰璇环3璧嬪��,鎵�浠ヤ細鏄剧ず 璇环3涓嶇瓑浜庣┖瀛楃涓茶�屾槸绛変簬null ,瀵艰嚧鍚庨潰鐨勫垽鏂繘涓嶅幓
// if (this.targetEvent.Related_Opportunity1__c != '' || this.targetEvent.Related_Opportunity2__c != '' || this.targetEvent.Related_Opportunity3__c != '') {
System.debug('娴嬭瘯璇环浠诲姟:' +'璇环1:' +this.targetEvent.Related_Opportunity1__c +'---璇环2:'+this.targetEvent.Related_Opportunity2__c);
@@ -1048,10 +1052,10 @@
taskType = System.Label.OpportunityFollow; // 璇环璺熻繘浠诲姟
} else if (this.targetEvent.OPDPlan_Flag__c) {
taskType = System.Label.OPD; // OPD浠诲姟
- } else if (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account_Energy__c == 1 || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account__c == 1) {
- taskType = System.Label.TargetAccountVisit; // 鐩爣瀹㈡埛鎷滆浠诲姟
- } else if (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H1' || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H0') {
- taskType = System.Label.visitHLevel; // H灞傛嫓璁夸换鍔�
+ } else if (!accToNumTarget.isEmpty() && !accToDepMap.isEmpty() && (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account_Energy__c == 1 || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).Is_Target_Account__c == 1)) {
+ taskType = System.Label.TargetAccountVisit; // 鐩爣瀹㈡埛鎷滆浠诲姟
+ } else if (!accToNumTarget.isEmpty() && !accToDepMap.isEmpty() && (accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H1' || accToNumTarget.get(accToDepMap.get(this.targetEvent.whatid__c)).OCM_Category__c == 'H0')) {
+ taskType = System.Label.visitHLevel; // H灞傛嫓璁夸换鍔�
} else {
taskType = System.Label.DailyVisit;// 鏃ョ▼鎷滆浠诲姟
}
@@ -1834,7 +1838,7 @@
//2021-11-02 mzy 浠诲姟绠＄悊鏀瑰杽寮�鍙戣鍒� end
//5.鐢宠绫诲瀷
tempCancelPostponePlan.ApplyType__c = '寤舵湡';
-
+ tempCancelPostponePlan.isDailyReportDelay__c = true;//2022-4-22 yjk 浜嬩欢寤舵湡odp澧炲姞鏍囪瘑锛岄槻姝㈠惊鐜�
insert tempCancelPostponePlan;
}
--
Gitblit v1.9.1