From fd2184ee47221684ceccf93b7a65428835055253 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 06 四月 2022 11:55:06 +0800
Subject: [PATCH] Merge branch 'PIPLDeploy0405'
---
force-app/main/default/classes/XinDailyReportController.cls | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/XinDailyReportController.cls b/force-app/main/default/classes/XinDailyReportController.cls
index 607ba0e..a91874d 100644
--- a/force-app/main/default/classes/XinDailyReportController.cls
+++ b/force-app/main/default/classes/XinDailyReportController.cls
@@ -78,7 +78,14 @@
public String repoErrorMessage{get;set;}
public String idParam{get;set;}
public Integer activitiesSize {get;set;}
-
+ //Add By Li Jun 20220224 for PIPL start
+ public String idVisitor1PI{set;get;}
+ public String idVisitor2PI{set;get;}
+ public String idVisitor3PI{set;get;}
+ public String idVisitor4PI{set;get;}
+ public String idVisitor5PI{set;get;}
+ public String staticResource {get; set;}
+ //Add By Li Jun 20220224 for PIPL end
//*************************Create 20160630 OCM-231 瓒欏境鑺� Start*************************//
public String completionFlg{get;set;}
public Daily_Report__c reportBak {get;set;}
@@ -91,8 +98,14 @@
public String etAPPMsg1 {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
public String etAPPMsg2 {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
public String etAPPFlg {get;set;} // 20210603 zh ETAPP涓庢棩鎶ヨ仈鍔�
+ //Add By Li Jun for PIPL 20220225
+ public String contactAWSIds{set;get;}
+ public String acSize{set;get;}
/**銆�銈炽兂銈广儓銉┿偗銈裤��*/
public XinDailyReportController() {
+ PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Contact');
+ staticResource = JSON.serialize(piIntegration);
+ system.debug('static resource:'+JSON.serialize(staticResource));
EsetId = ApexPages.currentPage().getParameters().get('id');
completionFlg = ApexPages.currentPage().getParameters().get('completion');
eventFlg = ApexPages.currentPage().getParameters().get('event');
@@ -113,6 +126,9 @@
/**銆�銈炽兂銈广儓銉┿偗銈裤��*/
public XinDailyReportController(ApexPages.StandardController controller) {
+ PIHelper.PIIntegration piIntegration = PIHelper.getPIIntegrationInfo('Contact');
+ staticResource = JSON.serialize(piIntegration);
+ system.debug('static resource:'+JSON.serialize(staticResource));
EsetId = ApexPages.currentPage().getParameters().get('id');
completionFlg = ApexPages.currentPage().getParameters().get('completion');
eventFlg = ApexPages.currentPage().getParameters().get('event');
@@ -469,6 +485,35 @@
managerCommentEditFlg = false;
}
reportBak = report;
+ //Add By Li Jun for PIPL 20220225 Start
+
+ List<String> conAWSIds = new List<String>();
+ Set<String> contactIdsForReport = new Set<String>();
+ for(Activity a:activities){
+ if(String.isNotEmpty(a.act.Visitor1_ID__c)&&String.isNotBlank(a.act.Visitor1_ID__c)){
+ contactIdsForReport.add(a.act.Visitor1_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor2_ID__c)&&String.isNotBlank(a.act.Visitor2_ID__c)){
+ contactIdsForReport.add(a.act.Visitor2_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor3_ID__c)&&String.isNotBlank(a.act.Visitor3_ID__c)){
+ contactIdsForReport.add(a.act.Visitor3_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor4_ID__c)&&String.isNotBlank(a.act.Visitor4_ID__c)){
+ contactIdsForReport.add(a.act.Visitor4_ID__c);
+ }
+ if(String.isNotEmpty(a.act.Visitor5_ID__c)&&String.isNotBlank(a.act.Visitor5_ID__c)){
+ contactIdsForReport.add(a.act.Visitor5_ID__c);
+ }
+ system.debug('Activity:'+JSON.serialize(a.act.Visitor1_ID__c));
+ }
+ List<Contact> conListForReport = new List<Contact>([select id,AWS_Data_Id__c from Contact where id in:contactIdsForReport and AWS_Data_Id__c!='']);
+ for(Contact con:conListForReport){
+ conAWSIds.add(con.AWS_Data_Id__c);
+ }
+ contactAWSIds = JSON.serialize(conAWSIds);
+ system.debug('Contact AWSIDs:'+contactAWSIds);
+ //Add By Li Jun for PIPL 20220225 End
return null;
}
@@ -1252,7 +1297,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;
}
@@ -3003,6 +3049,11 @@
String reason = TaskAndOPDMapping.get(eventCAndTaskMap.get(task.Id).CancelReason__c);
tempCancelPostponePlan.cancelReasonCombobox__c = reason == null || ''.equals(reason) ? '鍏朵粬': reason;
+ System.debug('椤甸潰鐨勭悊鐢�:'+eventCAndTaskMap.get(task.Id).CancelReason__c);
+ System.debug('鏃ユ姤涓璒PD鍙栨秷鐞嗙敱Map:'+TaskAndOPDMapping);
+ System.debug('鏃ユ姤涓璒PD鍙栨秷鐞嗙敱:'+reason);
+ System.debug('鏃ユ姤涓璒PD鍙栨秷鐞嗙敱涓簄ull:'+(reason == null));
+ System.debug('鏃ユ姤涓璒PD鍙栨秷鐞嗙敱涓虹┖瀛楃涓�:'+(''.equals(reason)));
//2021-11-02 mzy 浠诲姟绠＄悊鏀瑰杽 end
// if('瀹㈡埛浜嬩欢鍙樻洿鎴栧啿绐�'.equals(eventCAndTaskMap.get(task.Id).CancelReason__c)){
@@ -3544,7 +3595,7 @@
if(insertCancelPostponePlan.size() > 0){
insert insertCancelPostponePlan;
}
-
+
}catch(Exception ex){
logstr += '\n' + ex.getMessage();
//2022-02-07 mzy 鏃ュ織淇敼 start
--
Gitblit v1.9.1