From 988f9735377909b6310301e582c15804e004783f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 07 十月 2023 10:36:13 +0800
Subject: [PATCH] 近期修改cjw

---
 force-app/main/default/classes/FixtureRentalPDFController.cls |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/FixtureRentalPDFController.cls b/force-app/main/default/classes/FixtureRentalPDFController.cls
index 0c0d353..5c7d62f 100644
--- a/force-app/main/default/classes/FixtureRentalPDFController.cls
+++ b/force-app/main/default/classes/FixtureRentalPDFController.cls
@@ -116,15 +116,18 @@
                                 QRId__c,
                                 AWS_Data_Id__c,//20220304 
                                 Direct_Shippment_Address_Encrypt__c,//20220304
-                                Phone_Number_Encrypt__c//20220304
+                                Phone_Number_Encrypt__c,//20220304
+                                Routine_Check_Status__c,//20230526 lc DB202303417030 add
+                                Routine_Check_Day__c,//20230526 lc DB202303417030 add
+                                Routine_Check_Person__c//20230526 lc DB202303417030 add
                         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);
+            qrcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.QRId__c,'QR');
+            barcode = ConsumTrialPDFController.GetImageBase64(ApplyHeadShow.BRId__c,'BR');
         }
         //澧炲姞鍊熷嚭澶囧搧SET涓�瑙圠ist锛屼负浜嗚幏鍙栧�熷嚭澶囧搧SET涓�瑙堟槑缁�
         List<String> RAESSearchList = New List<String>();

--
Gitblit v1.9.1