From 8badb57ea2c82557850ad5b39281c3e8714eb119 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期四, 24 十一月 2022 10:08:31 +0800
Subject: [PATCH] 科室信息漏传SPO问题
---
force-app/main/default/classes/NFM501FutureController.cls | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/NFM501FutureController.cls b/force-app/main/default/classes/NFM501FutureController.cls
index cd34a5f..b974e7a 100644
--- a/force-app/main/default/classes/NFM501FutureController.cls
+++ b/force-app/main/default/classes/NFM501FutureController.cls
@@ -4,13 +4,19 @@
// 鎶曟爣鎴鏃堕棿
// 2021/01/04 18:00
//add by sushanhu for pi 20220310 start
- public static String txId;
+ public String txId;
//add by sushanhu for pi 20220310 end
public String rowData_id;
public NFM501FutureController(String rowData_id) {
this.rowData_id = rowData_id;
}
+ //add by sushanhu for pi 20220310 start
+ // public NFM501FutureController(String rowData_id,String txId) {
+ // this.rowData_id = rowData_id;
+ // this.txId = txId;
+ // }
+ //add by sushanhu for pi 20220310 end
public static Integer batch_retry_max_cnt = Integer.valueOf(System.Label.batch_retry_max_cnt);
public void execute(QueueableContext context /*, String iflog_Id*/ ) {
//闇�鍔犱竴鏁板瓧鍙橀噺锛堝鏋滆幏鍙栧埌 html闄勪欢锛屽叾浠栭檮浠讹紝鍦ㄦ棩蹇椾腑鏄剧ず鏁伴噺锛�
@@ -22,7 +28,14 @@
from BatchIF_Log__c where RowDataFlg__c = true and Id = : rowData_id
];
//瀛樻斁鎶ラ敊淇℃伅
- txId =rowData.AWS_Transaction_Id__c; //add by sushanhu for pipl 20220310
+ //add by sushanhu for pipl 20220311 start
+ system.debug('txId from log'+rowData.AWS_Transaction_Id__c);
+ if (!String.isEmpty(rowData.AWS_Transaction_Id__c)) {
+ txId =rowData.AWS_Transaction_Id__c; //add by sushanhu for pipl 20220310
+ }else {
+ system.debug('txId from NF501'+txId);
+ }
+ //add by sushanhu for pipl 20220311 end
system.debug('nfm501future awsid'+txId);
BatchIF_Log__c iflog501Future = new BatchIF_Log__c();
iflog501Future.Type__c = 'NFM501';
@@ -32,11 +45,14 @@
iflog501Future.RowDataFlg__c = false;
iflog501Future.AWS_Transaction_Id__c=rowData.AWS_Transaction_Id__c;
insert iflog501Future;
- NFM501FutureController.main(rowData.Id, iflog501Future.Id, false);
+ NFM501FutureController.main(rowData.Id, iflog501Future.Id, false,txId);
}
+
@future(callout = true)
//閲嶅彂锛堟妸浠庢帴鍙ｈ幏鍙栧埌鐨勬暟鎹瓨鍏ユ棩蹇椾腑锛屽啀鎶婃棩蹇椾腑瀛樺叆鐨勬暟鎹噸鏂癑OSN瑙ｆ瀽涓�閬嶏級
- public static void main(String rowData_id, String iflog_id, boolean Manual_execution501future) {
+ public static void main(String rowData_id, String iflog_id, boolean Manual_execution501future,
+ String txId //澧炲姞浜嬪姟id forpipl 20220310
+ ) {
BatchIF_Log__c rowData = [Select Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c,
Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c,
Log12__c, MessageGroupNumber__c, retry_cnt__c, NFM501Future_Count__c,
@@ -55,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;
}
@@ -106,7 +123,8 @@
SumUnit__c, AreaCity__c, AreaCountry__c, AgentUnit1__c,
AgentUnit2__c, AgentUnit3__c, AgentUnit4__c, AgentUnit5__c,
ZhaoRelationName__c, ZhongRelationName__c,
- publicDate__c, noticeDate__c, ResultDate__c
+ publicDate__c, noticeDate__c, ResultDate__c,
+ AWS_Data_Id__c //ADD FOR pi SUSHANHU 20220311
FROM Tender_information__c Where ProjectId__c in : projectIdList
];
Map < String, Tender_information__c > TenMap = new Map < String, Tender_information__c > ();
@@ -142,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)) {
@@ -196,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) ) {
@@ -235,7 +262,7 @@
//杞崲琛紙閫夐」鍒楄〃鐨勪笅鎷夐�夐」锛�
//鎺ュ彛浼犳潵鍏朵粬鍏憡
if (String.isBlank(te1.Id)) { //鍒ゆ柇鎷涙爣椤圭洰鏄惁瀛樺湪
- if ('5'.equals(LI.infoType)) {
+ if ('5'.equals(LI.infoType) || '2'.equals(LI.infoType)) { //20220510 lt SWAG-CE6C45
//鎷涙姇鏍囬」鐩悕绉�
te1.InfoTitle__c = LI.infoTitle == null ? te1.InfoTitle__c : LI.infoTitle;
//椤圭洰闃舵
@@ -284,19 +311,19 @@
}
// 棰勫憡璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌棰勫憡鐨勫綋鍓嶆椂闂�
// 濡傛灉鏈夊�硷紝涓嶆槸绗竴娆★紝濡傛灉娌″��
- if ('1'.equals(LI.infoType) && te1.noticeDate__c == null) {
+ if (('1'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.noticeDate__c == null) { //20220510 lt SWAG-CE6C45
te1.noticeDate__c = Date.today();
System.debug('noticeDate__c:' + te1.noticeDate__c);
}
System.debug('LI.infoType:' + LI.infoType);
System.debug('te1.ResultDate__c:' + te1.ResultDate__c);
// 缁撴灉璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌缁撴灉鐨勫綋鍓嶆椂闂�
- if ('3'.equals(LI.infoType) && te1.ResultDate__c == null) {
+ if (('3'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.ResultDate__c == null) { //20220510 lt SWAG-CE6C45
te1.ResultDate__c = Date.today();
System.debug('ResultDate__c:' + te1.ResultDate__c);
}
// 鍏憡璁板綍鏃� 鍙栫涓�娆¤幏鍙栧埌鍏憡鐨勫綋鍓嶆椂闂�
- if ('0'.equals(LI.infoType) && te1.publicDate__c == null) {
+ if (('0'.equals(LI.infoType) || '2'.equals(LI.infoType)) && te1.publicDate__c == null) { //20220510 lt SWAG-CE6C45
te1.publicDate__c = Date.today();
System.debug('publicDate__c:' + te1.publicDate__c);
}
@@ -501,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)) {
@@ -529,6 +556,7 @@
if (DetlList.size() > 0) {
delete DetlList;
}
+ system.debug('updateTenderMap---'+json.serialize(updateTenderMap));
if (updateTenderMap.values().size() > 0) {
upsert updateTenderMap.values();
}
@@ -537,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
@@ -572,6 +601,7 @@
insert insertbidInfoFileList;
}
if (!Manual_execution501future) {
+ //娴嬭瘯 Open the comment by Li Jun 20220404
System.enqueueJob(new NFM502Controller(rowData.id));
}
// logstr += '\nend';
@@ -581,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