From 048f7b0855d05293e80c9bf5dbf0620f064f13f4 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期四, 11 五月 2023 10:51:19 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/classes/rentalApplyEquipmentRentalPDFController.cls |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/classes/rentalApplyEquipmentRentalPDFController.cls b/force-app/main/default/classes/rentalApplyEquipmentRentalPDFController.cls
index 9959c74..372a2e2 100644
--- a/force-app/main/default/classes/rentalApplyEquipmentRentalPDFController.cls
+++ b/force-app/main/default/classes/rentalApplyEquipmentRentalPDFController.cls
@@ -1,12 +1,12 @@
-public with sharing class rentalApplyEquipmentRentalPDFController {
-    public rentalApplyEquipmentRentalPDFController() {
-        
-    }
+public with sharing class RentalApplyEquipmentRentalPDFController {
+
     @AuraEnabled
     public static InitData initJumptoPDFButton(String recordId) {
     	InitData res = new InitData();
     	try {
+    		Rental_Apply__c ra = [SELECT Id,Shipment_requested_cnt__c from Rental_Apply__c where Id = :recordId];
     		List<Rental_Apply_Equipment_Set__c> raeSet = [SELECT Id from Rental_Apply_Equipment_Set__c where Rental_Apply__c = :recordId and Yi_Shipment_request__c > 0 and RAES_Status__c != '鍙栨秷'];
+    		res.shipmentRequestedCnt = Integer.valueOf(ra.Shipment_requested_cnt__c);
     		Integer setLength = raeSet.size();
     		res.pageLength = Math.mod(setLength,10)== 0 ? setLength/10 : Math.round(setLength) +1 ;
     	}catch(Exception e){
@@ -17,9 +17,11 @@
 
     public class InitData{
 		@AuraEnabled
-		public String Id;
+		public String id;
 		@AuraEnabled
 		public Integer pageLength;
+		@AuraEnabled
+		public Integer shipmentRequestedCnt;
 	}
     
 }
\ No newline at end of file

--
Gitblit v1.9.1