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/InstructReportController.cls | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/InstructReportController.cls b/force-app/main/default/classes/InstructReportController.cls
index c4a3b44..a3d65cd 100644
--- a/force-app/main/default/classes/InstructReportController.cls
+++ b/force-app/main/default/classes/InstructReportController.cls
@@ -6,9 +6,14 @@
public list<InstructedstaffInfo> checkedISList { get; private set; }
public list<InstructedstaffInfo> uncheckedISList { get; private set; }
public boolean ReadOnly { get; private set; }
+
+ // 20220222 PI鏀归�� by Bright--start
+ public string staticResource { get; private set; }
+ // 20220222 PI鏀归�� by Bright--end
+
public InstructReportController() {
this.ReadOnly = true;
-
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Contact'));// 20220222 PI鏀归�� by Bright
}
public InstructReportController(ApexPages.StandardController controller) {
this();
@@ -102,6 +107,7 @@
Is_Active_Formula__c
//澧炲姞妫�绱� 鏈夋晥/鏃犳晥 绮剧悽鎶�鏈� wql 2021/02/04 end
,Contact_ID__c, Contact_ID__r.Name,
+ Contact_ID__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
// LJPH-BVNBMM start
Contact_ID__r.AccountId,
Department_Service__c,
@@ -123,6 +129,7 @@
,Is_Active_Formula__c
//澧炲姞妫�绱� 鏈夋晥/鏃犳晥 绮剧悽鎶�鏈� wql 2021/02/04 end
, ContactID__C
+ ,ContactID__r.AWS_Data_Id__c// 20220222 PI鏀归�� by Bright
//甯︽暀鎶ュ憡 鏂板鏌ヨ瀛楁锛氬甫鏁欏湴鐐广�佸甫鏁欏湴鐐癸紙鍏朵粬锛夈�佽澶囩被鍒�佸叿浣撳瀷鍙枫�佸娉� 绮剧悽鎶�鏈� wql 2020/04/14 start
, Instruct_place_other__c, Specific_model__c,
Instruct_remarks__c, Equipment_category__c, Instruct_place__c, Instruct_content__c
@@ -169,12 +176,14 @@
for (InstructedstaffInfo uncheckedIS : uncheckedISList) {
if (uncheckedIS.rec_checkBox) {
+ System.debug('uncheckedIS.CamMem.Contact_ID__r='+uncheckedIS.CamMem.Contact_ID__r.AWS_Data_Id__c);
uncheckedIS.IS = new Instructed_staff__c(Name = uncheckedIS.CamMem.Contact_ID__r.Name,
// LJPH-BVNBMM 鏀逛负鍚屾褰撳墠鑱旂郴浜烘墍鍦ㄧ殑绉戝 start
Department__c = uncheckedIS.CamMem.Contact_ID__r.AccountId,
// LJPH-BVNBMM 鏀逛负鍚屾褰撳墠鑱旂郴浜烘墍鍦ㄧ殑绉戝 start
CampaignMember__c = uncheckedIS.CamMem.id,
- ContactID__c = uncheckedIS.CamMem.Contact_ID__c
+ ContactID__c = uncheckedIS.CamMem.Contact_ID__c,
+ ContactID__r = uncheckedIS.CamMem.Contact_ID__r // 20220222 PI鏀归�� by Bright
);
uncheckedIS.lineNo = temuncheckedISList.size();
temcheckedISList.add(uncheckedIS);
--
Gitblit v1.9.1