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/FixtureRentalPDFController.cls | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/FixtureRentalPDFController.cls b/force-app/main/default/classes/FixtureRentalPDFController.cls
index ed66ecf..da042cf 100644
--- a/force-app/main/default/classes/FixtureRentalPDFController.cls
+++ b/force-app/main/default/classes/FixtureRentalPDFController.cls
@@ -30,12 +30,20 @@
public String centreAddress { get; set; }
public Boolean IsShowLU { get; set; } //鏄惁鏄剧ず绛炬敹鍗曞乏涓婅鏂囧瓧 true鏄剧ず 20201119 LJH OCSM_BP5-61 add
public Boolean IsMain; //鏄惁鏄幇鍦板垎閰嶇殑涓诲崟 20201120 LJH OCSM_BP5-61 add
+
+ public string staticResource { get; private set; }
+ public string staticResourceFile { get; private set; }
+ public Boolean addFlag { get; private set; }//鏁忔劅鍦板潃浣跨敤鏍囪
+ public String qrcode { get; private set; }
+ public String barcode { get; private set; }
public FixtureRentalPDFController() {
pageNum = Integer.valueOf(ApexPages.currentPage().getParameters().get('page'));
rentalApplyIdIMG = ApexPages.currentPage().getParameters().get('raid');
//Apexpages.currentPage().getHeaders().put('X-UA-Compatible', 'IE=8');
// rentalApplyId = ApexPages.currentPage().getParameters().get('raid');//20201120 ljh
String tempStr = ApexPages.currentPage().getParameters().get('raid');
+
+ addFlag = false;
rentalApplyId = new List<String>();
if(tempStr != null){
rentalApplyId.add(tempStr);
@@ -48,6 +56,8 @@
// 鐢婚潰鍒濆鍖�
public void init() {
+ staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Rental_Apply__c'));
+ staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
// 鏂拌濂ユ灄宸存柉澶囧搧绛炬敹鍗昉DF鐢婚潰鍒濆鍖�
PageCutList = new List<List<String>>();
List<Rental_Apply__c> ApplyList = new List<Rental_Apply__c>();
@@ -95,14 +105,20 @@
Agency_Address_Id__c,//20201124 LJH OCSM_BP5-61 add
Root_Rental_Apply__c,//20210617 ljh 1732 add
BRId__c, // 20211209 ljh SFDC-C923SR add
+ direct_send__c,
QRImg__c,
- QRId__c
+ QRId__c,
+ AWS_Data_Id__c,//20220304
+ Direct_Shippment_Address_Encrypt__c,//20220304
+ Phone_Number_Encrypt__c//20220304
from Rental_Apply__c
where id = :rentalApplyId];
}
if(ApplyList.size()>0){
ApplyHeadShow = ApplyList[0];
+ qrcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.QRId__c);
+ barcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.BRId__c);
}
//澧炲姞鍊熷嚭澶囧搧SET涓�瑙圠ist锛屼负浜嗚幏鍙栧�熷嚭澶囧搧SET涓�瑙堟槑缁�
List<String> RAESSearchList = New List<String>();
@@ -191,6 +207,7 @@
ShippMentAdr = ApplyHeadShow.Shippment_adress_detail__c;
} else {
ShippMentAdr = ApplyHeadShow.Direct_shippment_address__c;
+ addFlag = true;
}
Integer ShipAdrSize = ShippMentAdr == null ? 0 : ShippMentAdr.length();
@@ -340,7 +357,7 @@
mainCnt = 0;
accessoryCnt = 0;
for (Rental_Apply_Equipment_Set_Detail__c ra : RAESDLine) {
- if (ra.Is_Body__c) {
+ if (ra.Is_Body__c) {
mainCnt += 1;
} else {
accessoryCnt += 1;
--
Gitblit v1.9.1