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/EnquiryDetailsController.cls | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/EnquiryDetailsController.cls b/force-app/main/default/classes/EnquiryDetailsController.cls
index 0da312e..1a988b4 100644
--- a/force-app/main/default/classes/EnquiryDetailsController.cls
+++ b/force-app/main/default/classes/EnquiryDetailsController.cls
@@ -22,7 +22,8 @@
showOppOName = new Opportunity();
//鏂板Competitor__c瀛楄妭
//2021-12-10 澧炲姞 涓爣鏃� 鎷涙爣鏃� yjk
- String soql = 'select id,Name,Competitor__c,Opportunity_stage__c,TenderBeginDate__c,Closing_Bid_Date_Bid__c,Application_Amount_Submit__c,Budget_Amount_Approval__c,Bid_Date__c,Close_Forecasted_Date__c,CloseDate,Closing_Bid_Date__c,Department_Name__c,Status_Formula__c,Close_Forecasted_Assume_Date__c from Opportunity where id = :ESetId';
+ //璇环杩涘彛璁鸿瘉 fy 20220803 start ,if_NeedImportDemonstration__c,ImportDemonstration_state__c,ImportDemonstration_Filing_date__c,ImportDemonstration_Approval_date__c, ImportDemonstration_Rejection_date__c
+ String soql = 'select id,Name,Competitor__c,Opportunity_stage__c,TenderBeginDate__c,Closing_Bid_Date_Bid__c,Application_Amount_Submit__c,Budget_Amount_Approval__c,Bid_Date__c,Close_Forecasted_Date__c,CloseDate,Closing_Bid_Date__c,Department_Name__c,Status_Formula__c,Close_Forecasted_Assume_Date__c,if_NeedImportDemonstration__c,ImportDemonstration_state__c,ImportDemonstration_Filing_date__c,ImportDemonstration_Approval_date__c, ImportDemonstration_Rejection_date__c from Opportunity where id = :ESetId';
String sql = 'select name , id ,Related_Opportunity'+IndexNum+'__c,Related_Opportunity'+IndexNum+'_ID__c from Event__c where Related_Opportunity'+IndexNum+'_ID__c =:ESetId';
//List<Event__c> showName = Database.query(sql);
List<Opportunity> OppoName = Database.query(soql);
@@ -111,7 +112,8 @@
SWAG-B8Y84V 2019-02-11 start
*/
//*************************Insert 20160627 OCM-225 瓒欏境鑺� Start*************************//
- else if((Old_Competitor == 'C'||Old_Competitor == 'A'||Old_Competitor == 'B')&&(insOppo.Competitor__c =='D'||insOppo.Competitor__c =='E')){
+ // else if((Old_Competitor == 'C'||Old_Competitor == 'A'||Old_Competitor == 'B')&&(insOppo.Competitor__c =='D'||insOppo.Competitor__c =='E')){
+ else if((Old_Competitor == 'C'||Old_Competitor == 'A'||Old_Competitor == 'B')&&insOppo.Competitor__c =='D'){
insOppo.Opportunity_stage__c.addError('璇环绛夌骇宸茶揪鍒�'+Old_Competitor+',璇环绛夌骇涓篊鍙婁互涓婄殑锛屼笉鍙互淇敼鍒癉鎴朎');
goOrNot = false;
}
@@ -132,8 +134,14 @@
Oppo.Budget_Amount_Approval__c = insOppo.Budget_Amount_Approval__c;
Oppo.Bid_Date__c = insOppo.Bid_Date__c;
Oppo.Closing_Bid_Date__c = insOppo.Closing_Bid_Date__c;
- Oppo.Close_Forecasted_Date__c = insOppo.Close_Forecasted_Date__c;
- Oppo.Close_Forecasted_Assume_Date__c = insOppo.Close_Forecasted_Assume_Date__c;
+ // Oppo.Close_Forecasted_Date__c = insOppo.Close_Forecasted_Date__c; //20220809 lt
+ // Oppo.Close_Forecasted_Assume_Date__c = insOppo.Close_Forecasted_Assume_Date__c; //20220809 lt
+ //璇环杩涘彛璁鸿瘉 fy 20220803 start
+ Oppo.if_NeedImportDemonstration__c = insOppo.if_NeedImportDemonstration__c;
+ Oppo.ImportDemonstration_Filing_date__c = insOppo.ImportDemonstration_Filing_date__c;
+ Oppo.ImportDemonstration_Approval_date__c = insOppo.ImportDemonstration_Approval_date__c;
+ Oppo.ImportDemonstration_Rejection_date__c = insOppo.ImportDemonstration_Rejection_date__c;
+ //璇环杩涘彛璁鸿瘉 fy 20220803 end
//Oppo.CloseDate = insOppo.CloseDate;
update Oppo;
goOrNot = true;
@@ -141,7 +149,7 @@
ApexPages.addMessage(new ApexPages.message(ApexPages.severity.INFO, '淇濆瓨瀹屼簡!'));
// SWAG-B8Y84V 2019-02-11 end
}catch(DmlException ex) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ' '+ex.getDmlMessage(0)));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ' '+ex));
//SAP涓婁紶鍚庯紝涓嶅厑璁镐慨鏀广�岄娴婳CM绛剧害鏃ャ��
system.debug('娴嬭瘯杩涘叆13锛�'+ex.getDmlMessage(0));
return null;
@@ -150,6 +158,10 @@
system.debug('娴嬭瘯杩涘叆12');
}
+ //璇环杩涘彛璁鸿瘉 ssm 20220823 淇濆瓨鎴愬姛鍚庡埛鏂伴〉闈� start
+ this.init();
+ //璇环杩涘彛璁鸿瘉 ssm 20220823 start
return null;
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1