From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/classes/NewMCHUpperLimitPDFController.cls | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/NewMCHUpperLimitPDFController.cls b/force-app/main/default/classes/NewMCHUpperLimitPDFController.cls
index f4ace2d..83d18c8 100644
--- a/force-app/main/default/classes/NewMCHUpperLimitPDFController.cls
+++ b/force-app/main/default/classes/NewMCHUpperLimitPDFController.cls
@@ -167,7 +167,7 @@
public String Payment_Plan_Sum_Fifth_in_Word {get; private set;}
public String Payment_Plan_Sum_Sixth_in_Word {get; private set;}
public String Total_Contract_Amount_In_Words {get; private set;}
- public Decimal Limit_Price_Amount {get; private set;}
+ public String Limit_Price_Amount {get; private set;}
public String Limit_Price_Amount_in_Word {get; private set;}
@@ -493,10 +493,10 @@
this.Total_Contract_Amount_In_Words = MC.Total_Contract_Amount_In_Words__c;
// this.Total_Contract_Amount_In_Words = MC.Total_Contract_Amount_In_Words__c.substring(0,MC.Total_Contract_Amount_In_Words__c.length()-2);
}
- if(MC.Limit_Price_Amount__c != null){
- this.Limit_Price_Amount = MC.Limit_Price_Amount__c;
- // this.Total_Contract_Amount_In_Words = MC.Total_Contract_Amount_In_Words__c.substring(0,MC.Total_Contract_Amount_In_Words__c.length()-2);
- }
+ // if(MC.Limit_Price_Amount__c != null){
+ // this.Limit_Price_Amount = MC.Limit_Price_Amount__c;
+ // // this.Total_Contract_Amount_In_Words = MC.Total_Contract_Amount_In_Words__c.substring(0,MC.Total_Contract_Amount_In_Words__c.length()-2);
+ // }
if(MC.Limit_Price_Amount_in_Word__c != null){
this.Limit_Price_Amount_in_Word = MC.Limit_Price_Amount_in_Word__c;
// this.Total_Contract_Amount_In_Words = MC.Total_Contract_Amount_In_Words__c.substring(0,MC.Total_Contract_Amount_In_Words__c.length()-2);
@@ -565,6 +565,9 @@
if(MC.Contract_Amount__c != null ){
this.Contract_Amount = String.format(MC.Contract_Amount__c.format(), args);
}
+ if(MC.Limit_Price_Amount__c != null ){
+ this.Limit_Price_Amount = String.format(MC.Limit_Price_Amount__c.format(), args);
+ }
this.Amount_Warranty_Coverage = MC.Amount_Warranty_Coverage__c;
this.Amount_Warranty_Coverage_In_Word = MC.Amount_Warranty_Coverage_In_Word__c;
this.TermZero_One = '鐢层�佷箼鍙屾柟缁忚繃鍏卞悓鍗忓晢锛屽氨鐢叉柟鍏�';
--
Gitblit v1.9.1