fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 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;待Intake判定&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;待EtQ Initiation&apos; ,
IF( OR(
ISNULL(OCSM_RC_CordingDate__c),
PAE_reappear_confirm__c !=&apos;已确认&apos;),
&apos;待Final判定&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;待EtQ 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>