From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/QIS_Report__c/fields/AwareDate__c.field-meta.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/AwareDate__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/AwareDate__c.field-meta.xml
index df4064a..781714d 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/AwareDate__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/AwareDate__c.field-meta.xml
@@ -13,6 +13,16 @@
 	)
 )*/
 
+/*if(ComplaintStatus__c = &apos;闈炲璞�&apos;, null,
+IF( AE_DetermineResult__c = &apos;AE&apos;,
+    Trable_occur_daY_collect__c,
+    if( text( PAE_Determine__c) = &apos;PAE&apos; || text(PAE_Determine__c) = &apos;Unknown&apos;,
+        Trable_occur_daY_collect__c,
+        IF(text( PAE_DetermineAC__c) = &apos;PAE&apos; || text(PAE_DetermineAC__c) = &apos;Unknown&apos;,
+                 QIS_Reply_day__c,
+null
+))))*/
+IF(!ISBLANK(MBC_AwareDate__c),MBC_AwareDate__c,
 if(ComplaintStatus__c = &apos;闈炲璞�&apos;, null,
 IF( AE_DetermineResult__c = &apos;AE&apos;,
     Trable_occur_daY_collect__c,
@@ -21,7 +31,7 @@
         IF(text( PAE_DetermineAC__c) = &apos;PAE&apos; || text(PAE_DetermineAC__c) = &apos;Unknown&apos;,
                  QIS_Reply_day__c,
 null
-))))</formula>
+)))))</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>AwareDate.</label>
     <required>false</required>

--
Gitblit v1.9.1