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/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml b/force-app/main/default/objects/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml
index 03c2619..98aa58f 100644
--- a/force-app/main/default/objects/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml
+++ b/force-app/main/default/objects/QIS_Report__c/fields/ComplaintStatus__c.field-meta.xml
@@ -5,8 +5,8 @@
     <externalId>false</externalId>
     <formula>IF(OR(TEXT(QIS_Status__c)=&apos;鑽夋涓�&apos;,TEXT(QIS_Status__c)=&apos;FSE濉啓瀹屾瘯&apos;,TEXT(QIS_Status__c)=&apos;鍙栨秷鐢宠&apos;,TEXT(QIS_Status__c)=&apos;鍙栨秷&apos;,QIS_Submit_day__c&lt;DATE(2020,04,20)),
    &apos;闈炲璞�&apos;, 
-   /*add by rentx 2020-10-23 start*/
-    if((is_CNBuy__c = &apos;true&apos;), 
+   /*add by rentx 2020-10-23 start;20220413 ljh Is_Box__c*/
+    if((is_CNBuy__c = &apos;true&apos; || Is_Box__c), 
       &apos;闈炲璞�&apos;, 
       IF((ETQ_UPLOAD_STATUS__c = &apos;3&apos;),
         &apos;EtQ鍚屾澶辫触&apos;,
@@ -23,7 +23,9 @@
                 &apos;寰匛tQ Response&apos;,
               if(And(QIS_Determine__c = &apos;瑕�&apos;,isblank(Text(if_QIS_Allowed__c))),&apos;寰呰繘琛孮IS鍒ゅ畾&apos;,
                
-              IF(AND(ISNULL(QIS_Reply_day__c),ISNULL(QIS_OSH_answerdate__c)) ,
+              IF( OR(AND(ISNULL(QIS_Reply_day__c),ISNULL(QIS_OSH_answerdate__c)),
+                     AND(!ISNULL(QIS_Reply_day__c),ISNULL(OCSM_RC_CordingDate__c),RC_problem_not_found__c = true),
+                     AND(!ISNULL(QIS_Reply_day__c),PAE_reappear_confirm__c !=&apos;宸茬‘璁�&apos;,RC_problem_not_found__c = true)),
                  &apos;寰呭垎鏋�&apos;, 
                  IF( OR(AND(!ISNULL(QIS_Reply_day__c),ISNULL(OCSM_RC_CordingDate__c),RC_problem_not_found__c != true),
                         AND(!ISNULL(QIS_Reply_day__c),PAE_reappear_confirm__c !=&apos;宸茬‘璁�&apos;,RC_problem_not_found__c != true),

--
Gitblit v1.9.1