From 2d5b6ced9bbcb7a30159fd892b39d27a7e048b82 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期日, 24 四月 2022 09:41:45 +0800
Subject: [PATCH] BatchForAgencyContact
---
force-app/main/default/classes/ConsumTrialPDFController.cls | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/ConsumTrialPDFController.cls b/force-app/main/default/classes/ConsumTrialPDFController.cls
index 265e304..7c8c801 100644
--- a/force-app/main/default/classes/ConsumTrialPDFController.cls
+++ b/force-app/main/default/classes/ConsumTrialPDFController.cls
@@ -22,6 +22,8 @@
public String errorMsg { get; set; } // 閿欒淇℃伅
public string staticResource { get; private set; }
+ public string staticResourceCon { get; private set; }
+ public string staticResourceFile { get; private set; }
public string BRSrc{get;private set;}
public string QRSrc{get;private set;}
@@ -32,6 +34,8 @@
}
pdfPageList = new List<PdfPageClass>();
staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply_Equipment_Set_Detail__c'));
+ staticResourceCon = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply__c'));
+ staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
}
/**
@@ -87,6 +91,7 @@
, Post_Code__c // 閭紪
, Loaner_received_staff__c // 鎺ユ敹浜哄鍚�
, Loaner_received_staff_phone__c // 鎺ユ敹浜虹數璇�
+ ,AWS_Data_Id__c
FROM Consum_Apply__c
WHERE Id = :targetConsumApplyId
];
@@ -154,7 +159,7 @@
FROM Consum_Apply_Equipment_Set_Detail__c
WHERE Consum_Apply_Equipment_Set__r.Consum_Apply__c = :targetConsumApplyId // 鑰楁潗澶囧搧閰嶅涓�瑙�.鑰楁潗澶囧搧鐢宠
AND (Cancel_Select__c = false OR NG_Select_Again__c = true)
- AND Shipment_request_time2__c != null
+ // AND Shipment_request_time2__c != null //Commented By Li Jun 20220422 for PIPL
ORDER BY Consum_Apply_Equipment_Set__r.Consum_Apply__c, Consum_Apply_Equipment_Set__c, Fixture_Model_No_F__c, Degree_Of_Importance__c
];
if (consumApplySetDetailList.size() > 0) {
--
Gitblit v1.9.1