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/CancelPostponePlanHandler.cls | 66 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/classes/CancelPostponePlanHandler.cls b/force-app/main/default/classes/CancelPostponePlanHandler.cls
index 77b6857..ee65c7c 100644
--- a/force-app/main/default/classes/CancelPostponePlanHandler.cls
+++ b/force-app/main/default/classes/CancelPostponePlanHandler.cls
@@ -67,7 +67,9 @@
// } else if (oldMap.get(cpp.Id).get('Status__c') != cpp.Status__c && cpp.Status__c == '寤舵湡鎴愬姛') {
} else if (Trigger.isInsert && cpp.Status__c == '寤舵湡鎴愬姛' ||
Trigger.isUpdate && oldMap.get(cpp.Id).get('Status__c') != cpp.Status__c && cpp.Status__c == '寤舵湡鎴愬姛') {
+
opdplan.Id = cpp.CancelOPDPlan__c;
+
// SWAG-BXDC25 mzy 瀹℃壒鍚庯紝鏇存柊銆怬PD璁″垝瀹炴柦鏃ユ湡temp銆� Start
//opdplan.OPDPlan_ImplementDate__c = cpp.NextPlanDate__c;
opdplan.OPDPlan_ImplementDate_temp__c = cpp.NextPlanDate__c;
@@ -110,7 +112,24 @@
// SWAG-BUF6J5 20201111 you start
if (cancelIdSet.size() > 0) {//鏌ヨopd璁″垝涓嬪緱鎵�鏈夊鍝佸�熷嚭鐢宠 鏇存柊 鐘舵��
List<Rental_Apply__c> Rentals = new List<Rental_Apply__c>();
- List<Rental_Apply__c> RentalList = [select id,Cancel_Reason__c , Loaner_cancel_request__c,OPDPlan__c from Rental_Apply__c where OPDPlan__c in: cancelIdSet and Status__c <> '鍙栨秷'];
+ // 20230222 ljh DB202301265636 start
+ // 20230202 ljh DB202301265636 start
+ // List<Rental_Apply__c> RentalList = [select id,Cancel_Reason__c , Loaner_cancel_request__c,OPDPlan__c from Rental_Apply__c where OPDPlan__c in: cancelIdSet and Status__c <> '鍙栨秷'];
+ List<Rental_Apply__c> RentalList = [select id,Cancel_Reason__c , Loaner_cancel_request__c,OPDPlan__c from Rental_Apply__c where OPDPlan__c in: cancelIdSet and Status__c <> '鍙栨秷' AND Shipment_request_Cnt__c = 0];
+ // 20230202 ljh DB202301265636 end
+ // 瀛︿細鍙栨秷鎵瑰噯鐨勬椂鍊� 鍙戦偖浠� 涓嶄笂绾夸簡
+ // List<Rental_Apply__c> RentalList = new List<Rental_Apply__c>();
+ // List<Rental_Apply__c> RentalCancleAlertList = new List<Rental_Apply__c>();
+ // List<Rental_Apply__c> RentalListTemp = [select id,Cancel_Reason__c , Loaner_cancel_request__c,OPDPlan__c,Shipment_request_Cnt__c from Rental_Apply__c where OPDPlan__c in: cancelIdSet and Status__c <> '鍙栨秷'];
+ // for(Rental_Apply__c ra:RentalListTemp){
+ // if(ra.Shipment_request_Cnt__c == 0){
+ // RentalList.add(ra);
+ // }else{
+ // ra.CancelDay__c = Date.today();
+ // RentalCancleAlertList.add(ra);
+ // }
+ // }
+ // 20230222 ljh DB202301265636 end
Set<String> cancelIdSet1 = new Set<String>(); //鎵嬪姩璋冨洖瀹℃壒
SS_Batch_Column_Mapping__c mpdMapping = SS_Batch_Column_Mapping__c.getValues('Rental_Apply_OPD_Cancle');
//2021/02/07 liying SWAG-BXVDPJ start
@@ -137,13 +156,8 @@
for (Rental_Apply__c rtl : RentalList) {
if(rtl.OPDPlan__c == cpp.CancelOPDPlan__c && cpp.if_HaveRental_Apply__c == false){
cancelIdSet1.add(rtl.id);
- System.debug('鐞嗙敱姹囨�荤殑Map:'+opdMap);
- System.debug('鐞嗙敱:'+(cpp.cancelReasonCombobox__c));
- System.debug('鐞嗙敱鏄惁鐩哥瓑:'+(opdMap.containsKey(cpp.cancelReasonCombobox__c)));
// 2021/02/07 liying SWAG-BXVDPJ start
if(opdMap.containsKey(cpp.cancelReasonCombobox__c)){
-
- System.debug('鍙栨秷鐞嗙敱:'+(opdMap.get(cpp.cancelReasonCombobox__c).split(';')[1]) +' \r\n '+'澶囧搧鍙栨秷鐞嗙敱:'+opdMap.get(cpp.cancelReasonCombobox__c).split(';')[0]);
rtl.Cancel_Reason__c = opdMap.get(cpp.cancelReasonCombobox__c).split(';')[1];
rtl.Loaner_cancel_reason__c = opdMap.get(cpp.cancelReasonCombobox__c).split(';')[0];
rtl.Loaner_cancel_request__c = opdMap.get(cpp.cancelReasonCombobox__c).split(';')[0];
@@ -158,25 +172,31 @@
}
}
if (cancelIdSet1.size() > 0) {
- List<Approval.ProcessWorkitemRequest> requests = new List<Approval.ProcessWorkitemRequest> ();
- Map<ID,ProcessInstance> piMap = New Map<ID,ProcessInstance>([Select Id from ProcessInstance where TargetObjectId IN :cancelIdSet1]);
- system.debug('==cancelIdSet1=='+cancelIdSet1);
- for(ProcessInstanceWorkItem wi : [Select Id from ProcessInstanceWorkItem where ProcessInstanceId IN :piMap.keySet()]){
- Approval.ProcessWorkitemRequest req2 = new Approval.ProcessWorkitemRequest();
- req2.setAction('Removed');
- req2.setWorkitemId(wi.Id);
- requests.add(req2);
+ List<Approval.ProcessWorkitemRequest> requests = new List<Approval.ProcessWorkitemRequest> ();
+ Map<ID,ProcessInstance> piMap = New Map<ID,ProcessInstance>([Select Id from ProcessInstance where TargetObjectId IN :cancelIdSet1]);
+ system.debug('==cancelIdSet1=='+cancelIdSet1);
+ for(ProcessInstanceWorkItem wi : [Select Id from ProcessInstanceWorkItem where ProcessInstanceId IN :piMap.keySet()]){
+ Approval.ProcessWorkitemRequest req2 = new Approval.ProcessWorkitemRequest();
+ req2.setAction('Removed');
+ req2.setWorkitemId(wi.Id);
+ requests.add(req2);
+ }
+ system.debug('==requests.size()=='+requests.size());
+ if (requests.size() > 0) {
+ Approval.ProcessResult[] processResults = null;
+ processResults = Approval.process(requests, true);
+ system.debug('==璋冨洖瀹℃壒寰楃粨鏋�=='+processResults);
+ }
}
- system.debug('==requests.size()=='+requests.size());
- if (requests.size() > 0) {
- Approval.ProcessResult[] processResults = null;
- processResults = Approval.process(requests, true);
- system.debug('==璋冨洖瀹℃壒寰楃粨鏋�=='+processResults);
+ if(Rentals.size()>0){
+ update Rentals;
}
- }
- if(Rentals.size()>0){
- update Rentals;
- }
+ // 20230222 ljh DB202301265636 start
+ // 瀛︿細鍙栨秷鎵瑰噯鐨勬椂鍊� 鍙戦偖浠� 涓嶄笂绾夸簡
+ // if(RentalCancleAlertList.size() > 0 ){
+ // update RentalCancleAlertList;
+ // }
+ // 20230222 ljh DB202301265636 end
}
// SWAG-BUF6J5 20201111 you end
//2021-08-11 mzy SWAG-C5RAZV 浜嬩欢鈥斺�旇鍒� 寤舵湡 璋冩煡 start
--
Gitblit v1.9.1