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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/SimpleEventRegisterController.cls b/force-app/main/default/classes/SimpleEventRegisterController.cls
index 1f0225b..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;
}
@@ -1180,7 +1180,7 @@
taskAccType = '鐢ㄦ埛鎷滆';
}
if (this.targetEvent.Activity_Type2__c == '璨╁２搴�') {
- taskAccType = '缁忛攢鍟嗘嫓璁�';
+ taskAccType = '缁忛攢鍟嗘敮鎸�';
}
if (this.targetEvent.Activity_Type2__c == '绀惧銈ゃ儥銉炽儓') {
taskAccType = '瀛︽湳浼氳';
@@ -1213,7 +1213,7 @@
taskAccType = '鐢ㄦ埛鎷滆';
}
if (this.targetEvent.Activity_Type2__c == '璨╁２搴�') {
- taskAccType = '缁忛攢鍟嗘嫓璁�';
+ taskAccType = '缁忛攢鍟嗘敮鎸�';
}
if (this.targetEvent.Activity_Type2__c == '绀惧銈ゃ儥銉炽儓') {
taskAccType = '瀛︽湳浼氳';
--
Gitblit v1.9.1