From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_F__c.field-meta.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_F__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_F__c.field-meta.xml
index 5d09d46..9009a31 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_F__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/fields/NG_Final_reply_day_F__c.field-meta.xml
@@ -4,13 +4,12 @@
     <externalId>false</externalId>
     <formula>IF(TEXT(Received_Confirm__c) = &apos;NG&apos;
         &amp;&amp; (
-              (Not(ISNULL(Asset_return_day2__c)) &amp;&amp; DATEVALUE(Loaner_received_time__c + 7) &lt; Asset_return_day2__c)
-            || (ISNULL(Asset_return_day2__c) &amp;&amp; Loaner_received_time__c + 7 &lt; now())
+              (Not(ISNULL(Asset_return_day2__c)) &amp;&amp; DATEVALUE(Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0)) &lt; Asset_return_day2__c)
+            || (ISNULL(Asset_return_day2__c) &amp;&amp; Loaner_received_time__c + 7 + NULLVALUE(Condition_Seven_Days__c,0) &lt; now())
         )
         &amp;&amp; Rental_Apply__r.DataMigration_Flag__c = FALSE, DATEVALUE(Shippment_loaner_time2__c + 14),
     null
 )</formula>
-    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鏈�鏂伴瀹氬綊杩樻棩_鏀惰揣NG_F</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1