From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新

---
 force-app/main/default/classes/OPDPlanCancelPostponePlanLogicBatch.cls |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/OPDPlanCancelPostponePlanLogicBatch.cls b/force-app/main/default/classes/OPDPlanCancelPostponePlanLogicBatch.cls
index ce3a52f..3b42a8a 100644
--- a/force-app/main/default/classes/OPDPlanCancelPostponePlanLogicBatch.cls
+++ b/force-app/main/default/classes/OPDPlanCancelPostponePlanLogicBatch.cls
@@ -89,8 +89,9 @@
                 raIdSet.add(raes.Rental_Apply__c);
             }    
             //20220920  ljh update SWAG-CHM5E4 end
+            // 20221220 ljh DB202212267051 add Split_Apply_Reason__c
             List<Rental_Apply__c> rtlList =
-                [select id, RA_Status__c, OPDPlan__c from Rental_Apply__c where OPDPlan__c in :OpdRtlList];
+                [select id, RA_Status__c, OPDPlan__c,Split_Apply_Reason__c from Rental_Apply__c where OPDPlan__c in :OpdRtlList];
             //鍙栧嚭澶囧搧鍊熷嚭鐘舵�佷笉鏄崏妗堜腑,鐢宠涓�,鍙栨秷鐨勫彇娑堝欢鏈熸暟鎹斁鍏ap
             for (Rental_Apply__c rtl : rtlList) {
                 //20221007  ljh update SWAG-CHM5E4 start
@@ -102,7 +103,11 @@
                     // OPD璁″垝-鎵�鏈夊鍝丮ap
                     rtl3Set.add(rtl.OPDPlan__c);
                 }
-                if(raIdSet.contains(rtl.Id)){
+                // 20221220 ljh DB202212267051 start
+                // 鍝佺敵璇蜂笂鈥滃垎鍗曠悊鐢扁�濅负鈥滃埌璐G鍒嗗崟鈥濆拰鈥滆拷鍔犻檮灞炲搧鍒嗗崟鈥濓紝鑷姩寤舵湡涓�娆★紝瓒呮湡涓嶅彇娑堛��
+                // if(raIdSet.contains(rtl.Id)){
+                if(raIdSet.contains(rtl.Id) || (String.isNotBlank(rtl.Split_Apply_Reason__c) && (rtl.Split_Apply_Reason__c == '鍒拌揣NG鍒嗗崟' || rtl.Split_Apply_Reason__c == '杩藉姞闄勫睘鍝佸垎鍗�'))){
+                // 20221220 ljh DB202212267051 start
                     rtlMap.put(rtl.OPDPlan__c, rtl);
                 } 
                 //20221007  ljh update SWAG-CHM5E4 end

--
Gitblit v1.9.1