From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/classes/RentalApplyWebService.cls | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 2799614..07efef2 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -1194,8 +1194,12 @@
// return '淇悊鏈�缁堟娴嬫棩涓嶄负绌猴紝涓嶈兘鍒嗛厤';
// }else if(Ra.repair__r.Return_Without_Repair_Date__c !=null){
// return '鏈慨鐞嗗綊杩樻棩涓嶄负绌猴紝涓嶈兘鍒嗛厤';
- if(Ra.Campaign__c != null && Ra.Campaign__r.Status == '鍙栨秷'){
- return '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
+ // 20230220 ljh DB202301265636 start
+ // if(Ra.Campaign__c != null && Ra.Campaign__r.Status == '鍙栨秷'){
+ // return '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
+ if(Ra.Campaign__c != null && (Ra.Campaign__r.Status == '鍙栨秷' || Ra.Campaign__r.Status == '鍙栨秷鐢宠涓�')){
+ return '瀛︿細鍙栨秷鐢宠涓垨鑰呭凡鍙栨秷锛屼笉鍙垎閰�';
+ // 20230220 ljh DB202301265636 end
}else if(Ra.repair__c != null && (Ra.repair__r.Repair_Final_Inspection_Date__c!=null || Ra.Repair__r.Repair_Shipped_Date__c != null)){
return '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
}else if(Ra.repair__c != null && Ra.repair__r.Return_Without_Repair_Date__c !=null){
--
Gitblit v1.9.1