From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Consumption_rate__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Consumption_rate__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Consumption_rate__c.field-meta.xml
index 1a17b28..2d8c3bf 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Consumption_rate__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Contract_Consumption_rate__c.field-meta.xml
@@ -2,7 +2,7 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Contract_Consumption_rate__c</fullName>
     <externalId>false</externalId>
-    <formula>IF(Management_Code__c = &apos;SH-RS-FJ0054009&apos;, 0.3535, if(contractAmountForRate__c=0,0,(currentTotalRepairAmount__c + previousTotalRepairAmount__c )/contractAmountForRate__c)  )</formula>
+    <formula>IF(Management_Code__c = &apos;SH-RS-FJ0054009&apos;, 0.3535, if(contractAmountForRate__c=0,0,if(RecordType.DeveloperName = &apos;VM_Contract&apos;,((currentTotalRepairAmount__c + previousTotalRepairAmount__c )/(GuaranteePrice_Amount__c*1.13)),(currentTotalRepairAmount__c + previousTotalRepairAmount__c )/contractAmountForRate__c)))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>娑堣垂鐜�(姣忔湀瀹炴椂)</label>
     <precision>18</precision>

--
Gitblit v1.9.1