From 2f183a6b0a83ec3f7d35375d5d25d200efc2a3e1 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 19 四月 2022 18:46:18 +0800
Subject: [PATCH] 20220419FixIssue
---
force-app/main/default/classes/XinDailyReportController.cls | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/XinDailyReportController.cls b/force-app/main/default/classes/XinDailyReportController.cls
index 351fafb..4d40ade 100644
--- a/force-app/main/default/classes/XinDailyReportController.cls
+++ b/force-app/main/default/classes/XinDailyReportController.cls
@@ -733,6 +733,7 @@
Purpose_Type__c = e.Purpose_Type__c,
Related_Opportunity1__c = e.Related_Opportunity1__c,
OPDPlan_Flag__c = e.OPDPlan_Flag__c,
+ Opd_Plan__c = e.Opd_Plan__c, //2022-4-14 yjk 澧炲姞opd璁″垝
Related_Opportunity1_ID__c = e.Related_Opportunity1_ID__c,
Related_Opportunity2__c = e.Related_Opportunity2__c,
Related_Opportunity2_ID__c = e.Related_Opportunity2_ID__c,
@@ -1297,7 +1298,8 @@
//2021-10-15 mzy 浠诲姟绠＄悊鏀瑰杽 end
) {
if (!String.isBlank(a.act.Activity_Type2__c) && a.act.Activity_Type2__c == '鐥呴櫌'
- && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1__c)) {
+ && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1_ID__c)) { //Add By Chen Yanan 20220325 for PIPL
+ // && a.act.Free_Input__c == false && String.isBlank(a.act.Visitor1__c)) {
a.act.Visitor1__c.addError('璇疯嚦灏戝～鍐欎竴浣嶈闂璞�');
eventFlg = true;
}
@@ -2339,18 +2341,17 @@
if('鐢宠珛涓�'.equals(report.Status__c )){
XinDailyReportController.updateTask( report.id);
//sla淇℃伅鏇存柊 zh start
-
//2021-08-27 鏉ㄦ澃鍏� 淇敼閫昏緫锛氭槸鍚﹂�炬湡閮借皟鐢╯aveSLADetails鏂规硶锛屽皢鏄惁閫炬湡浼犲叆鏂规硶锛屾柟娉曞唴鍋氶�昏緫澶勭悊
if (eventCAndSLA.size()>0 && SLAIds.size()>0) {
UpdateSLACompleteNumber.saveSLADetails(eventCAndSLA, SLAIds,report.Submit_DateTime_New__c <= report.Report_Deadline__c );
}
if (report.Submit_DateTime_New__c <= report.Report_Deadline__c ) { //鎻愪氦鏃ヨ秴杩囨渶鍚庢彁浜ゆ湡闄愶紝涓嶈鍏ユ鏁�
-
if (eventCAndMainC.size()>0 && mainCIds.size()>0) {
UpdateSLACompleteNumber.saveSLARecorded(eventCAndMainC, mainCIds);
}
}
+
//sla淇℃伅鏇存柊 zh end
// 浠诲姟妗嗘灦bug 搴斿 by zys start 鍘熶唬鐮�
@@ -3666,6 +3667,9 @@
// 20200420 浠诲姟鏃ユ姤绠＄悊 add gzw end
activities.add(a);
actSize = activities.size();
+ //Add log by Li Jun 20220407 Start
+ system.debug('Activity Data:'+JSON.serialize(activities));
+ //Add log by Li Jun 20220407 end
}
public String delIndex {
--
Gitblit v1.9.1