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/TenderResultConfirmTaskBatch.cls | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/TenderResultConfirmTaskBatch.cls b/force-app/main/default/classes/TenderResultConfirmTaskBatch.cls
index 98a9e41..4ea7996 100644
--- a/force-app/main/default/classes/TenderResultConfirmTaskBatch.cls
+++ b/force-app/main/default/classes/TenderResultConfirmTaskBatch.cls
@@ -21,13 +21,13 @@
String query = 'Select Id, Opportunity__c, Tender_information__c, '
+ 'Tender_information__r.status__c, Tender_information__r.TenderManageCode__c,Tender_information__r.RecordTypeId, Tender_information__r.CreatedDate,'
+ 'Opportunity__r.OwnerId, Opportunity__r.AccountId, Opportunity__r.StageName__c, '
- + 'Opportunity__r.Assistant_Applied_Date__c, Opportunity__r.Cnt_Lost_cancel_Draft__c, Opportunity__r.ConfirmationofAward__c, '
+ + 'Opportunity__r.Assistant_Applied_Date__c, Opportunity__r.Cnt_Lost_cancel_Draft__c, Opportunity__r.Cnt_Lost_cancel_report__c, Opportunity__r.DirectLossFLG__c, Opportunity__r.ConfirmationofAward__c, '
+ 'Opportunity__r.Contract_DB_complite_day__c, Opportunity__r.Contract_Authorize_Lock__c, Opportunity__r.LeakageNumber__c, '
+ 'Opportunity__r.ConfirmationofAward_createTime__c '
+ 'FROM Tender_Opportunity_Link__c '
+ 'WHERE Tender_information__r.InfoType__c = \'3锛氱粨鏋淺' '
- + 'AND (Tender_information__r.subInfoType__c = \'3-5锛氫腑鏍囬�氱煡\' OR Tender_information__r.subInfoType__c = \'3-6锛氬悎鍚屽叕鍛奬') '
- + 'AND Tender_information__r.RecordTypeId = \'01210000000VLUI\' ';
+ + 'AND (Tender_information__r.subInfoType__c = \'3-5锛氫腑鏍囬�氱煡\' OR Tender_information__r.subInfoType__c = \'3-6锛氬悎鍚屽叕鍛奬') ';
+ //+ 'AND Tender_information__r.RecordTypeId = \'01210000000VLUI\' ';
//20220715 you 鎷涙爣浠诲姟 start
if(TenderIds !=null && TenderIds.size() > 0){
@@ -73,11 +73,11 @@
system.debug('test3'+topp.Opportunity__c);
logstr += 'Batch execute ' + '\r\n 璇环杩涘叆for----- :'+ topp;
// 宸插瓨鍦ㄦ湁鏁堢姸鎬佷换鍔＄殑璇环锛屼笉鐢ㄥ啀娆′骇鐢熶换鍔�
- if (mapTask.isEmpty()
- || (!mapTask.isEmpty() && !mapTask.containsKey(topp.Opportunity__c))){
+ if ((mapTask.isEmpty()
+ || (!mapTask.isEmpty() && !mapTask.containsKey(topp.Opportunity__c))) && !(topp.Opportunity__r.DirectLossFLG__c || topp.Opportunity__r.StageName__c == '澶卞崟' || topp.Opportunity__r.Cnt_Lost_cancel_report__c > 0) && !(topp.Opportunity__r.Contract_DB_complite_day__c != null && topp.Opportunity__r.Contract_Authorize_Lock__c)){
//1.鍐呴儴纭鐘舵�佷负05.璇环涓笖鍏宠仈璇环鐨勭姸鎬�1涓鸿浠� 涓� 浠锋牸鐢宠 涓嶇瓑浜� 鐪� -- > 鍒涘缓骞舵淳鍙戜换鍔�
- if (topp.Tender_information__r.status__c == '05.璇环涓�' && topp.Opportunity__r.StageName__c == '璇环' && topp.Opportunity__r.Assistant_Applied_Date__c == null && topp.Opportunity__r.LeakageNumber__c !=1){
+ if (topp.Tender_information__r.status__c == '05.璇环涓�' && topp.Opportunity__r.StageName__c == '璇环' && topp.Opportunity__r.Assistant_Applied_Date__c == null && !topp.Opportunity__r.DirectLossFLG__c){
logstr += 'Batch execute ' + '\r\n 璇环杩涘叆绗竴涓垽鏂潯浠�----- :'+ topp.Opportunity__c ;
Task__c tempTask = new Task__c();
tempTask.RecordTypeId = winBiddingTask_TaskId;
@@ -107,7 +107,7 @@
//2. 瀛樺湪宸叉彁浜ょ殑澶卞崟鎶ュ憡鎴栬�呰浠风姸鎬�1=澶卞崟 -- >涓爣纭锛氱珵浜夊鎵嬩腑鏍�
// 鎷涙爣椤圭洰涓殑涓爣纭鏇存敼鍦˙atch涓洿鏂�
- if (topp.Opportunity__r.Cnt_Lost_cancel_Draft__c > 0 || topp.Opportunity__r.StageName__c == '澶卞崟'){
+ if (topp.Opportunity__r.DirectLossFLG__c || topp.Opportunity__r.StageName__c == '澶卞崟'){
logstr += 'Batch execute ' + '\r\n 璇环杩涘叆绗簩涓垽鏂潯浠�----- :'+ topp.Opportunity__c ;
//涓爣纭瀛楁璧嬪�肩珵浜夊鎵嬩腑鏍�
if(oppMap.isEmpty() || !oppMap.containsKey(topp.Opportunity__c)){
--
Gitblit v1.9.1