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/AssessmentReportController.cls | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/AssessmentReportController.cls b/force-app/main/default/classes/AssessmentReportController.cls
index 929cb10..1e98ed4 100644
--- a/force-app/main/default/classes/AssessmentReportController.cls
+++ b/force-app/main/default/classes/AssessmentReportController.cls
@@ -7,6 +7,8 @@
public integer ASRRecordsNumber;
public boolean hasError;
public String ErrorMessages;
+ public String awsString{get; set;}
+ public String staticResource {get; set;}
public AssessmentReportController() {
@@ -71,6 +73,7 @@
return null;
}
setCurrentAssessmentReportStaff();
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));
} catch (Exception ex) {
ApexPages.addMessages(ex);
@@ -221,6 +224,7 @@
list<CampaignMember__c> CMlist = [
SELECT Id, Name, Department_ID__c,
Contact_ID__c, Contact_ID__r.Name,
+ Contact_ID__r.AWS_Data_Id__c,
dept__c, State__c, City__c
FROM CampaignMember__c
where Campaign__c = : AssessmentReport.Campaign__c
@@ -237,7 +241,7 @@
for (AssessmentReportStaff__c tempARS : tempAmrsList) {
ARSMap.put(tempARS.CampaignMember__c, tempARS);
}
-
+
for (CampaignMember__c tempCM : CMlist) {
if (ARSMap.containsKey(tempCM.id)) {
TempARSInfoList.add(
@@ -259,8 +263,8 @@
}
}
ARSInfoList = TempARSInfoList.clone();
-
-
+ awsString = JSON.serialize(ARSInfoList);
+
}
public PageReference Submit() {
system.debug('Submit start:');
--
Gitblit v1.9.1