From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/classes/ConsumTrialPDFController.cls | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/ConsumTrialPDFController.cls b/force-app/main/default/classes/ConsumTrialPDFController.cls
index ffdac9d..ec2f267 100644
--- a/force-app/main/default/classes/ConsumTrialPDFController.cls
+++ b/force-app/main/default/classes/ConsumTrialPDFController.cls
@@ -21,9 +21,9 @@
public Integer consumApplySetDetailListSize { get; set; } // 鑰楁潗澶囧搧鎬绘暟閲�
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 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;}
@@ -33,9 +33,9 @@
throw new ControllerUtil.myException('鍙傛暟閿欒锛氳鎸囧畾Id銆�');
}
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'));
+ 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'));
}
/**
@@ -91,7 +91,7 @@
, Post_Code__c // 閭紪
, Loaner_received_staff__c // 鎺ユ敹浜哄鍚�
, Loaner_received_staff_phone__c // 鎺ユ敹浜虹數璇�
- //,AWS_Data_Id__c //deloitte-zhj 20231010 PIPL杩樺師
+ ,AWS_Data_Id__c
FROM Consum_Apply__c
WHERE Id = :targetConsumApplyId
];
@@ -153,7 +153,7 @@
, Follower_User__r.Name
, Spare__c // 澶囩敤
, Comment__c // 澶囨敞
- //, AWS_Data_Id__c //deloitte-zhj 20231010 PIPL杩樺師
+ , AWS_Data_Id__c
, ManagementCode__c // 绠＄悊缂栫爜 yc 鑰楁潗杩芥函
, EquipmentManagementCode__c // 澶囧搧绠＄悊鐮� yc 鑰楁潗杩芥函
FROM Consum_Apply_Equipment_Set_Detail__c
@@ -226,13 +226,15 @@
public static string GetImageBase64(string id){
+ // 20231103 Lightning鏂囦欢淇敼 Start
List<ContentVersion> version =new List<ContentVersion>();
version = [select VersionData from ContentVersion where Id =: id];
+
if(version.size() > 0){
return 'data:image/png;base64,' + EncodingUtil.base64Encode(version[0].VersionData);
}else{
return '';
}
-
+ // 20231103 Lightning鏂囦欢淇敼 End
}
}
\ No newline at end of file
--
Gitblit v1.9.1