From 41a627eaaf29658a401ac43e4da838a5b622f44e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期一, 29 五月 2023 16:54:34 +0800
Subject: [PATCH] DB202303088261

---
 force-app/main/default/objects/task__c/fields/LatestFinishDate__c.field-meta.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/objects/task__c/fields/LatestFinishDate__c.field-meta.xml b/force-app/main/default/objects/task__c/fields/LatestFinishDate__c.field-meta.xml
index 0687df4..da71115 100644
--- a/force-app/main/default/objects/task__c/fields/LatestFinishDate__c.field-meta.xml
+++ b/force-app/main/default/objects/task__c/fields/LatestFinishDate__c.field-meta.xml
@@ -7,15 +7,22 @@
 2) 琚姩浠诲姟 :
 (1) OPD/璇环浠诲姟 : 鍒涘缓鏃ユ湡鐨勪笅涓嬩釜鏈堢殑鏈�鍚庝竴澶�
 (2)鐐规浠诲姟:璁″垝鏈熼棿缁撴潫鏃ユ湡
-(3) 涓嶆槸OPD/璇环浠诲姟鍜岀偣妫�浠诲姟 : 鍒涘缓鏃ユ湡 + 60澶�</description>
+(3) 涓嶆槸OPD/璇环浠诲姟鍜岀偣妫�浠诲姟 : 鍒涘缓鏃ユ湡 + 60澶�
+//涓爣浠诲姟锛寉ou 澧炲姞閫昏緫
+1锛変腑鏍囦换鍔★細鍒涘缓鏃ュ姞宸ヤ綔鏃�3澶�
+2锛夊け鍗曚换鍔★細鍒涘缓鏃ュ姞鑷劧鏃�30澶�</description>
     <externalId>false</externalId>
     <formula>IF(Text(taskDifferent__c) = &apos;涓婄骇鍒嗛厤浠诲姟&apos; &amp;&amp; taskType__c == &apos;鍏朵粬&apos;,
 HopeCompletionDate__c,
 IF( Text(taskDifferent__c) = &apos;涓诲姩浠诲姟&apos; || (Text(taskDifferent__c) = &apos;涓婄骇鍒嗛厤浠诲姟&apos; &amp;&amp; taskType__c != &apos;鍏朵粬&apos;),
-	CreateDate__c + 60,
-	IF( taskType__c = &apos;OPD&apos; || taskType__c = &apos;璇环璺熻繘&apos;,
- IF(Month(CreateDate__c)+3 &lt;= 12,Date(Year(CreateDate__c),Month(CreateDate__c)+3,1)-1 , Date(Year(CreateDate__c)+1,Month(CreateDate__c)+3-12,1)-1),
-IF(taskType__c = &apos;鐐规浠诲姟&apos;, PlanEndDate__c , CreateDate__c + 60) )))</formula>
+CreateDate__c + 60,
+ IF( taskType__c = &apos;涓爣缁撴灉纭&apos;, 
+Task_After_3_WorkDay__c,
+IF( taskType__c = &apos;澶卞崟鎶ュ憡浠诲姟&apos;, 
+CreateDate__c + 30,
+IF( taskType__c = &apos;OPD&apos; || taskType__c = &apos;璇环璺熻繘&apos;,
+IF(Month(CreateDate__c)+3 &lt;= 12,Date(Year(CreateDate__c),Month(CreateDate__c)+3,1)-1 , Date(Year(CreateDate__c)+1,Month(CreateDate__c)+3-12,1)-1),
+IF(taskType__c = &apos;鐐规浠诲姟&apos;, PlanEndDate__c , CreateDate__c + 60) ))) ))</formula>
     <label>鏈�鏅氬畬鎴愭棩</label>
     <required>false</required>
     <trackHistory>false</trackHistory>

--
Gitblit v1.9.1