From ee915c5009a0ecff56488487039d32b3643f8456 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 30 十一月 2022 16:50:28 +0800
Subject: [PATCH] Merge branch '集采'
---
force-app/main/default/classes/TenderInformationHandler.cls | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/TenderInformationHandler.cls b/force-app/main/default/classes/TenderInformationHandler.cls
index 84e9ee3..7248ca1 100644
--- a/force-app/main/default/classes/TenderInformationHandler.cls
+++ b/force-app/main/default/classes/TenderInformationHandler.cls
@@ -103,7 +103,7 @@
}
}
if (null!=oppTens && oppTens.size()>0) {
- List<Opportunity> opportunities = [select id, Bidding_Project_Name_Bid__c, TenderBeginDate_Text__c,Opp_Order__c from Opportunity where id in :oppIds];
+ List<Opportunity> opportunities = [select id, Bidding_Project_Name_Bid__c, Opp_Order__c from Opportunity where id in :oppIds];
List<task__c> taskList = [select id,taskStatus__c,Tender_information_Task__c,OpportunityId__c from task__c where (RecordType.Name ='澶卞崟鎶ュ憡浠诲姟' and OpportunityId__c in:oppIds) or (RecordType.Name ='涓爣缁撴灉纭' and Opp_Tender__c in :oppTens)];
for(task__c tsk : taskList){
tsk.taskStatus__c = '04 鍙栨秷';
@@ -758,6 +758,7 @@
Map<Id,Tender_information__c> tOldMap = (Map<Id,Tender_information__c>) Trigger.oldMap;
Map<Id,Tender_information__c> tNewMap = (Map<Id,Tender_information__c>) Trigger.newMap;
List<Date> cd = new List<Date>();
+ System.debug(LoggingLevel.INFO, '*** cd: ' + cd);
System.debug(LoggingLevel.INFO, '*** tOldMap: ' + tOldMap);
for(Tender_information__c t:(List<Tender_information__c>) Trigger.new){
System.debug(LoggingLevel.INFO, '*** 杩涘叆for寰幆: ');
@@ -781,20 +782,31 @@
}
}
Map<Date,String> lm = new Map<Date,String>();
- for(OlympusCalendar__c oc:[SELECT Id,Date__c FROM OlympusCalendar__c WHERE Date__c IN:cd]){
- lm.put(oc.Date__c,oc.Id);
- System.debug(LoggingLevel.INFO, '*** map璧嬪��: ');
- }
-
- for(Tender_information__c l:(List<Tender_information__c>) Trigger.new){
- if (l.relativeDate__c == null) {
- continue;
+ if(cd.size() > 0){
+ for(OlympusCalendar__c oc:[SELECT Id,Date__c FROM OlympusCalendar__c WHERE Date__c IN:cd]){
+ lm.put(oc.Date__c,oc.Id);
+ System.debug(LoggingLevel.INFO, '*** map璧嬪��: ');
}
- String datastr = String.valueOf(l.relativeDate__c);
- String dt = lm.get(Date.valueOf(datastr.substring(0,10)));
- l.Tender_Olympus__c = dt;
- System.debug(LoggingLevel.INFO, '*** l.Tender_Olympus__c: '+ l.Tender_Olympus__c);
+
+ for(Tender_information__c l:(List<Tender_information__c>) Trigger.new){
+ //lt 20221114 DB202211270805 銆愮揣鎬ャ�戞嫑鏍囬」鐩槸鍚︽寜鏃跺叧鑱旇绠楅敊璇� start
+ // if (l.relativeDate__c == null) {
+ // continue;
+ // }
+ if (l.relativeDate__c == null && l.OBSAP_relativeTime__c == null) {
+ continue;
+ }
+ Datetime relativetime = l.OBSAP_relativeTime__c != null ? l.OBSAP_relativeTime__c : l.relativeTime__c;
+ // String datastr = String.valueOf(l.relativeDate__c);
+ String datastr = String.valueOf(relativetime);
+ //lt 20221114 DB202211270805 銆愮揣鎬ャ�戞嫑鏍囬」鐩槸鍚︽寜鏃跺叧鑱旇绠楅敊璇� end
+ String dt = lm.get(Date.valueOf(datastr.substring(0,10)));
+ System.debug(LoggingLevel.INFO, '*** dt: '+ dt);
+ l.Tender_Olympus__c = dt;
+ System.debug(LoggingLevel.INFO, '*** l.Tender_Olympus__c: '+ l.Tender_Olympus__c);
+ }
}
+
}
// fxk 2021/8/3 鍙嶉�昏緫鍒犻櫎 end
// 20210824 涓爣鏃朵慨鏀瑰叧鑱旇浠风殑鎷涙爣椤圭洰鍚嶅拰涓爣鏃堕棿
--
Gitblit v1.9.1