From 29ec8b29f26b7d4b92cc75820ca7988d464c0185 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 29 三月 2022 13:39:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NFM503InfoFileBatch.cls | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/classes/NFM503InfoFileBatch.cls b/force-app/main/default/classes/NFM503InfoFileBatch.cls
index d9199c8..5149138 100644
--- a/force-app/main/default/classes/NFM503InfoFileBatch.cls
+++ b/force-app/main/default/classes/NFM503InfoFileBatch.cls
@@ -5,6 +5,8 @@
public static String transUrl;
public static String transId;
public static String token;
+ public static integer isSuccess=0;
+ public static List<String> sfRecordIds =new List<String>();
//add staic sushanhu 20220302 end
Boolean IsNeedExecute = false; //2021-06-28 mzy WLIG-BYHD79 SFDC鐜batch鍚堝苟璋冩煡 鏄惁绗﹀悎鎵ц鏉′欢
//add nfm 503 aws response start sushanhu 20220301
@@ -28,8 +30,8 @@
global Database.QueryLocator start(Database.BatchableContext bc) {
String query = 'select Id, Tender_information__c, infoAddress__c, ' +
- 'Tender_information__r.InfoType__c, isProcessed__c, ' +
- ' ErrorMessage__c from bidInfoFile__c where isProcessed__c = false ';
+ 'Tender_information__r.InfoType__c, isProcessed__c, ' +
+ ' ErrorMessage__c from bidInfoFile__c where isProcessed__c = false ';
if (String.isNotBlank(TenId)) {
query += 'and Tender_information__r.Id =: TenId';
}
@@ -95,7 +97,6 @@
transUrl =pi.searchUrl;
NFMUtil.response response = NFMUtil.getAWSQLMData(pi.newUrl ,JSON.serialize(queryfileList), token);
system.debug('aws result'+response.responseBody);
-
Map<String, Object> result = (Map<String, Object>)JSON.deserializeUntyped(response.responseBody);
system.debug('NFM503 aws result--'+response.responseBody+'status'+response.status);
transId =(String)result.get('txId');
@@ -191,15 +192,17 @@
update bidInfoFileList;
// add 纭浜嬪姟 sushanhu 20220302 start
- List<String> sfRecordIds = new List<String>();
+
+ if (fileList.size() > 0 ) {
for (FileAddress__c fileAddress : fileList) {
+ system.debug('fileAddress.Id---'+json.serialize(fileAddress));
sfRecordIds.add(fileAddress.Id);
system.debug('fileAddress.Id---'+fileAddress.Id);
}
+ }
system.debug('鎴愬姛鐨則oken'+token);
-
- PIHelper.confirmFileTrans('NFM503',1,JSON.serialize(sfRecordIds),transId,token,transUrl);
-
+ isSuccess =1;
+
// if (!confirm) {
// //鍥炴粴
// if (sp != null) {
@@ -215,9 +218,9 @@
if (sp != null) {
Database.rollback(sp);
}
- //add 纭浜嬪姟 20220302 sushanhu start
- system.debug('澶辫触鐨則oken'+token);
- PIHelper.confirmFileTrans('NFM503',0,'',transId,token,transUrl);
+ // //add 纭浜嬪姟 20220302 sushanhu start
+ // system.debug('澶辫触鐨則oken'+token);
+ // PIHelper.confirmFileTrans('NFM503',0,'',transId,token,transUrl);
//add 纭浜嬪姟 20220302 sushanhu end
bidInfoFile.ErrorMessage__c = '503鎶涘嚭寮傚父锛�' + ex.getMessage() + '\n' + ex.getStackTraceString();
system.debug('ErrorMessage'+bidInfoFile.ErrorMessage__c);
@@ -226,6 +229,13 @@
}
global void finish(Database.BatchableContext BC) {
-
+ // add confirm transaction for pipl sushanhu 20220314 start
+ if (isSuccess==0) {
+ PIHelper.confirmFileTrans('NFM503',isSuccess,'',transId,token,transUrl);
+ }else {
+ PIHelper.confirmFileTrans('NFM503',isSuccess,JSON.serialize(sfRecordIds),transId,token,transUrl);
+ }
+
+ // add confirm transaction for pipl sushanhu 20220314 end
}
}
\ No newline at end of file
--
Gitblit v1.9.1