From ead4df22dca33a867279471821ca675f91dec760 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期六, 14 五月 2022 18:44:54 +0800
Subject: [PATCH] FixIssue0514
---
force-app/main/default/classes/NEWCreateSWOQuoteController.cls | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/NEWCreateSWOQuoteController.cls b/force-app/main/default/classes/NEWCreateSWOQuoteController.cls
index 8762845..685702c 100644
--- a/force-app/main/default/classes/NEWCreateSWOQuoteController.cls
+++ b/force-app/main/default/classes/NEWCreateSWOQuoteController.cls
@@ -11,6 +11,8 @@
public String Id {get; set;}
public List<EmailInfo> mailList {get; set;}
+ public List<String> awsDataIdList{get; set;}// 20220512 PI鏀归�� by zhj
+ public String awsDataIdStr{get{return JSON.serialize(awsDataIdList);} set;}// 20220512 PI鏀归�� by zhj
public String baseUrl { get; set; }
public String rtUrl { get; set; }
@@ -31,6 +33,7 @@
public String staticResource { get; private set; }// 20220311 PI鏀归�� by Bright
public String contactstaticResource { get; private set; }// 20220311 PI鏀归�� by Bright
+ public String staticResourceMailMerge { get; private set; }// 20220512 PI鏀归�� by zhj
public NEWCreateSWOQuoteController() {
swoId = System.currentPageReference().getParameters().get('swoId');
@@ -48,6 +51,7 @@
staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Quotes__c'));// 20220221 PI鏀归�� by Bright
contactstaticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));// 20220221 PI鏀归�� by Bright
+ staticResourceMailMerge = JSON.serialize(PIHelper.getPIIntegrationInfo('Mail_Merge__c'));// 20220512 PI鏀归�� by zhj
}
public NEWCreateSWOQuoteController(ApexPages.StandardController controller) {
@@ -301,7 +305,7 @@
List<FileAddress__c> attList = new List<FileAddress__c>();
Map<String, List<FileAddress__c>> attMap = new Map<String, List<FileAddress__c>>();
- Map<String, Mail_Merge__c> mailMap = new Map<String, Mail_Merge__c>([select id, FROM__c, ccName__c, SUBJECT__c, MESSAGE__c, DATE__c, toName__c, EMAIL_SENT__c from Mail_Merge__c where Quotes__c = :Id order by id]);
+ Map<String, Mail_Merge__c> mailMap = new Map<String, Mail_Merge__c>([select id, FROM__c, ccName__c, SUBJECT__c, MESSAGE__c, DATE__c, toName__c, EMAIL_SENT__c,AWS_Data_Id__c from Mail_Merge__c where Quotes__c = :Id order by id]);
if (mailMap != null) {
@@ -330,6 +334,13 @@
}
// Mail 椤甸潰鍒濆鍖� End
+ //zhj 20220514 start PIPL start
+ //awsDataIdList
+ awsDataIdList = new List<String>();
+ for (Integer i = 0; i < mailList.size(); i++) {
+ awsDataIdList.add(mailList[i].mm.AWS_Data_Id__c);
+ }
+ //zhj 20220514 start PIPL end
}
//棣栧厛鏄粠swo鍒涘缓quotes锛屾湁浜唖woid,灏辨槸鐢ㄦ柊鐨勯潤鎬佽祫婧愭樉绀虹殑鍏嶈矗鐢虫槑銆�
//涔嬪悗锛岀紪杈戝凡缁忓垱寤哄畬浜嗙殑quotes锛�15鍙蜂箣鍓嶅垱寤虹殑锛屾樉绀虹殑鏄棫鐨勩�傛棫鐨勫氨鏄痑ftORbef==false銆�
--
Gitblit v1.9.1