From fb04e7c01d119c60632b4298d18fd93f3ccb3d79 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 06 四月 2022 10:32:05 +0800
Subject: [PATCH] 20220405DeployProduction
---
force-app/main/default/classes/NFM501FutureController.cls | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/NFM501FutureController.cls b/force-app/main/default/classes/NFM501FutureController.cls
index eef5e5c..5a9f148 100644
--- a/force-app/main/default/classes/NFM501FutureController.cls
+++ b/force-app/main/default/classes/NFM501FutureController.cls
@@ -71,9 +71,10 @@
rowData.ErrorLog__c = rowData.ErrorLog__c == null ? '' : rowData.ErrorLog__c;
// System.debug('+++++++1+++++++'+iflog501Future);
String QLMDataStr = NFMUtil.QLMgetRowDataStr(rowData);
+ system.debug('QLMDataStr---'+QLMDataStr);
NFM501controller.AllData getQLMData1 = (NFM501controller.AllData)
JSON.deserialize(QLMDataStr, NFM501controller.AllData.class);
-
+ system.debug('getQLMData1---'+json.serialize(getQLMData1));
if (getQLMData1 == null) {
return;
}
@@ -159,9 +160,13 @@
Set < String > TarDetailSet = new Set < String > ();
for (NFM501Controller.ListItem LI: getQLMData1.data.list1) {
+ system.debug('LI----'+json.serialize(LI));
// 闋呯洰杌㈤�併伄銈汇儍銉�
Tender_information__c te1 = new Tender_information__c();
//add aws dataid sushanhu 20220223 start
+ if(String.isEmpty(LI.DataId)){
+ continue;
+ }
te1.AWS_Data_Id__c = LI.DataId;
//add aws dataid sushanhu 20220223 end
if (String.isBlank(LI.projectId)) {
@@ -213,14 +218,19 @@
//杞崲琛紙瀹炵幇閫夐」鍒楄〃鐨勪笅鎷夐�夐」锛�
te1.BiddingType__c = NFMUtil.getMapValue(transferMap, 'BiddingType__c', LI.biddingType, iflog501Future);
te1.InfoQianlimaUrl__c = String.isBlank(LI.infoQianlimaUrl) ? te1.InfoQianlimaUrl__c : LI.infoQianlimaUrl;
+ System.debug('======111111111111========');
//鎷兼帴瀛楃涓�
if (LI.ZhaoRelationWay != null && LI.ZhaoRelationWay.size() > 0) {
+ System.debug('======LI.ZhaoRelationWay========'+LI.ZhaoRelationWay);
te1.ZhaoRelationWay__c = String.join(LI.ZhaoRelationWay, '锛�');
//add 瀵嗘枃 sushanhu 20220223 start
+ System.debug('======LI.ZhaoRelationWayEncrypted========'+LI.ZhaoRelationWayEncrypted);
te1.ZhaoRelationWay_Encrypted__c =String.join(LI.ZhaoRelationWayEncrypted,'锛�');
+ System.debug('======2222222222222========');
//add 瀵嗘枃 sushanhu 20220223 end
}
//杞崲琛紙閫夐」鍒楄〃鐨勪笅鎷夐�夐」锛�
+ System.debug('======3333333333333333========');
te1.IsElectronic__c = NFMUtil.getMapValue(transferMap, 'IsElectronic__c', LI.isElectronic, iflog501Future);
te1.XmNumber__c = String.isBlank(LI.xmNumber) ? te1.XmNumber__c : LI.xmNumber;
if ( String.isnotBlank(LI.tenderEndTime) ) {
@@ -518,7 +528,7 @@
//add 瀵嗘枃 sushanhu 20220223 end
}
-
+ System.debug('te1-----'+json.serialize(te1));
//绮剧悽绉戞妧 zxk 2021-11-11 SWAG-C637NF start
// 濡傛灉绗竴娆￠」鐩樁娈靛氨浼犳潵鍙樻洿鐘舵�佺殑璇濓紝閭ｄ箞灏变笉鐢熸垚鎷涙姇鏍囬」鐩紙鐢变簬鍙樻洿闃舵椤圭洰鍚嶇О浼犳潵涓虹┖锛屼负浜嗕笉璁╅」鐩悕鑷姩璧嬪�间负Id锛�
if (String.isNotBlank(te1.InfoType__c) && String.isNotBlank(LI.projectId)) {
@@ -546,6 +556,7 @@
if (DetlList.size() > 0) {
delete DetlList;
}
+ system.debug('updateTenderMap---'+json.serialize(updateTenderMap));
if (updateTenderMap.values().size() > 0) {
upsert updateTenderMap.values();
}
@@ -554,6 +565,7 @@
Map < string, Tender_information__c > TenderMap = new map < string, Tender_information__c > ();
for (Tender_information__c TMap: updateTenderMap.values()) {
+ system.debug('TMap---'+JSON.serialize(TMap));
TenderMap.put(TMap.ProjectId__c, TMap);
PIHelper.IdList il= new PIHelper.IdList();
// add for pipl sushanhu 20220310 start
@@ -589,6 +601,7 @@
insert insertbidInfoFileList;
}
if (!Manual_execution501future) {
+ //娴嬭瘯 Open the comment by Li Jun 20220404
System.enqueueJob(new NFM502Controller(rowData.id));
}
// logstr += '\nend';
@@ -598,13 +611,15 @@
throw new ControllerUtil.myException('aaa');
}
//纭浜嬪姟 add for pi sushanhu 20220310 start
- PIHelper.confirmTrans('NFM501',1,null,txId,NFM501AWS.token,NFM501AWS.transactionURL,idList);
+ // PIHelper.confirmTrans('NFM501',1,null,txId,NFM501AWS.token,NFM501AWS.transactionURL,idList);
+ PIHelper.insertConfirmTrans('NFM501',1,null,txId,1,NFM501AWS.transactionURL,idList);
//纭浜嬪姟 add for pi sushanhu 20220310 end
} catch (Exception ex) {
// 濡傛灉鏁版嵁鑾峰彇杩囩▼涓紝鏈夐敊璇紙鍚屼竴娓告爣锛屽鏋滄姤閿欙紝鏄粬閲嶆柊鑾峰彇涓�閬嶏紝濡傛灉涓夋閮芥病鑳借幏鍙栧埌锛屽氨鍙戦�侀偖浠舵姤閿欎俊鎭紝鐒跺悗鎵嬪姩杩涜鑾峰彇锛�
Database.rollback(sp);
//纭浜嬪姟 add for pi sushanhu 20220310 start
- PIHelper.confirmTrans('NFM501',0,null,txId,NFM501AWS.token,NFM501AWS.transactionURL,idList);
+ // PIHelper.confirmTrans('NFM501',0,null,txId,NFM501AWS.token,NFM501AWS.transactionURL,idList);
+ PIHelper.insertConfirmTrans('NFM501',0,null,txId,1,NFM501AWS.transactionURL,idList);
//纭浜嬪姟 add for pi sushanhu 20220310 end
System.debug(Logginglevel.ERROR, 'QLMData_' + rowData.MessageGroupNumber__c + ':' + ex.getMessage());
System.debug(Logginglevel.ERROR, 'QLMData_' + rowData.MessageGroupNumber__c + ':' + ex.getStackTraceString());
--
Gitblit v1.9.1