From 18468c3e8095eb907d3dd9ccc4c2222757289c7d Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 28 三月 2023 14:41:58 +0800
Subject: [PATCH] 上限合同打印
---
force-app/main/default/classes/NewMCHUpperLimitPDFController.cls | 13 ++++++++-----
force-app/main/default/classes/NewMCAgentUpperLimitPDFController.cls | 13 ++++++++-----
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/NewMCAgentUpperLimitPDFController.cls b/force-app/main/default/classes/NewMCAgentUpperLimitPDFController.cls
index 3b52745..6430b6e 100644
--- a/force-app/main/default/classes/NewMCAgentUpperLimitPDFController.cls
+++ b/force-app/main/default/classes/NewMCAgentUpperLimitPDFController.cls
@@ -174,7 +174,7 @@
public String Total_Contract_Amount_In_Words {get; private set;}
public integer Total_Payment_Time {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;}
public String TermZero_One {get; private set;}
public String TermZero_Two {get; private set;}
@@ -511,10 +511,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);
@@ -581,6 +581,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.FirstPartyAbbreviation = '锛堜互涓嬬畝绉扳�滅敳鏂光�濓級';
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