From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict

---
 force-app/main/default/objects/Report__c/fields/ComplaintStatus__c.field-meta.xml |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Report__c/fields/ComplaintStatus__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/ComplaintStatus__c.field-meta.xml
index 53f7ed5..3b67ee3 100644
--- a/force-app/main/default/objects/Report__c/fields/ComplaintStatus__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/ComplaintStatus__c.field-meta.xml
@@ -2,7 +2,43 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>ComplaintStatus__c</fullName>
     <externalId>false</externalId>
-    <formula>&apos;1&apos;</formula>
+    <formula>IF( RecordType_ID__c != &apos;01210000000Qeky&apos;,
+&apos;闈炲璞�&apos;,
+(IF(TEXT(Status__c) = &apos;鑽夋涓�&apos;,
+&apos;闈炲璞�&apos;,
+IF(ISNULL(Repair_ConfirmationDate__c),
+&apos;寰匢ntake鍒ゅ畾&apos;,
+IF(ISBLANK(Complaint_Number__c)
+&amp;&amp;OR(AE_DetermineResult__c = &apos;AE&apos; ,
+PAE_DetermineResults__c = &apos;PAE&apos; ,
+PAE_DetermineResults__c = &apos;Unknown&apos;,
+AND(!ISNULL(OCSM_RC_CordingDate__c),PAE_DetermineResults__c = &apos;Unknown&apos;) ),
+&apos;寰匛tQ Initiation&apos; ,
+IF( OR(
+ISNULL(OCSM_RC_CordingDate__c),
+PAE_reappear_confirm__c !=&apos;宸茬‘璁�&apos;),
+&apos;寰匜inal鍒ゅ畾&apos;,
+IF(AND(!ISNULL(OCSM_RC_CordingDate__c),
+ISBLANK(Complaint_Number__c),
+PAE_reappear_confirm__c =&apos;宸茬‘璁�&apos;,
+OR(AE_DetermineResult__c = &apos;nonAE&apos;,
+PAE_DetermineResults__c = &apos;nonPAE&apos;)),
+&apos;寰匛tQ Initiation&apos;,
+IF(PAE_reappear_confirm__c =&apos;宸茬‘璁�&apos;&amp;&amp;!ISNULL(OCSM_RC_CordingDate__c) &amp;&amp;!ISBLANK(Complaint_Number__c)
+&amp;&amp; OR( AE_DetermineResult__c = &apos;AE&apos;,
+AE_DetermineResult__c = &apos;nonAE&apos; ,
+OR(PAE_DetermineResults__c = &apos;PAE&apos;,PAE_DetermineResults__c = &apos;Unknown&apos;),
+PAE_DetermineResults__c = &apos;nonPAE&apos;) ,
+&apos;瀹屾瘯&apos;,
+&apos;&apos;
+)
+)
+)
+)
+)
+)
+)
+)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>Complaint鐘舵��</label>
     <required>false</required>

--
Gitblit v1.9.1