From ad655848436d4213b9de1510a98ea63374e85fcf Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期五, 18 三月 2022 13:27:10 +0800
Subject: [PATCH] 【委托】 【优先紧急对应】I/F010&I/F110传输检查修复和预测修复
---
force-app/main/default/classes/LogAutoSendBatch.cls | 137 +++++++++++++++++++++++++++++++++++++++++++--
force-app/main/default/classes/BeforeSSOpportunitySchedule.cls | 5 +
2 files changed, 135 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls b/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
index 552533e..e3d6dc8 100644
--- a/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
+++ b/force-app/main/default/classes/BeforeSSOpportunitySchedule.cls
@@ -22,7 +22,10 @@
String todayStr = Datetime.now().format('yyyy/MM/dd');
// if (todayStr == '2021/10/07') {
if (todayStr.endsWith('01')) {
- Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ // 20220318 ljh SWAG-CC54R2 update start
+ // Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ Id execBTId = Database.executeBatch(new LogAutoSendBatch('NFM010',true), 1);
+ // 20220318 ljh SWAG-CC54R2 update end
}
//姣忔湀1鍙疯繍琛� SWAG-C7ZC4L rentx end
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index d3fb1e2..d51e626 100644
--- a/force-app/main/default/classes/LogAutoSendBatch.cls
+++ b/force-app/main/default/classes/LogAutoSendBatch.cls
@@ -3,12 +3,18 @@
private String typeNFM;
private String messageGroupNumber;
private Datetime times;
+ private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
/**
* 銈炽兂銈广偪銉炽儓
*/
global LogAutoSendBatch() {
}
-
+ // 20220318 ljh SWAG-CC54R2 add start
+ global LogAutoSendBatch(String type,Boolean isForecast) {
+ this.typeNFM = type;
+ this.isForecast = isForecast;
+ }
+ // 20220318 ljh SWAG-CC54R2 add end
//20191224 HWAG-BK65E8 add start
global LogAutoSendBatch(String type, String message, Datetime times) {
this.typeNFM = type;
@@ -48,6 +54,18 @@
OR(NFM501_Web_Annex_Count__c != null
AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))]
);
+ // 20220318 ljh SWAG-CC54R2 add start
+ } else if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010'){
+ return Database.getQueryLocator(
+ [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, Type__c,
+ retry_cnt__c, NFM501Future_Count__c, NFM501_Web_Annex_Count__c
+ FROM BatchIF_Log__c
+ WHERE RowDataFlg__c = true
+ AND (retry_cnt__c = null OR (retry_cnt__c != null AND retry_cnt__c > 0 AND retry_cnt__c < : max_cnt))
+ AND Type__c = : typeNFM ]
+ );
+ // 20220318 ljh SWAG-CC54R2 add end
} else {
return Database.getQueryLocator(
[SELECT Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c,
@@ -202,6 +220,9 @@
if (strType_c == 'NFM601') {
NFM601Controller.ManualExecute(rowData.Id);
}
+ if (strType_c == 'NFM602') {
+ NFM602Controller.ManualExecute(rowData.Id);
+ }
if (strType_c == 'NFM606') {
NFM606Controller.ManualExecute(rowData.Id);
}
@@ -210,6 +231,21 @@
}
if (strType_c == 'NFM605') {
NFM605Controller.ManualExecute(rowData.Id);
+ }
+ if (strType_c == 'NFM607') {
+ NFM607Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM608') {
+ NFM608Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM609') {
+ NFM609Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM611') {
+ NFM611Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM612') {
+ NFM612Rest.main(rowData.Id);
}
if (strType_c == 'NFM620') {
NFM620Rest.main(rowData.Id);
@@ -220,22 +256,106 @@
if (strType_c == 'NFM621') {
NFM621Controller.execute(rowData, null);
}
- if (strType_c == 'NFM624') {
- NFM624Rest.main(rowData.Id);
- }
+ // if (strType_c == 'NFM624') {//鏅烘収鍖荤枟pk
+ // NFM624Rest.main(rowData.Id);
+ // }
if (strType_c == 'NFM622') {
NFM622Controller.execute(rowData, null);
}
- if (strType_c == 'NFM112') {
- NFM112Controller.execute(rowData, null);
+ // if (strType_c == 'NFM112') {//鍏堟鍚庝慨pk
+ // NFM112Controller.execute(rowData, null);
+ // }
+ if (strType_c == 'NFM701') {
+ NFM701Controller.execute(rowData, null);
}
+ // if (strType_c == 'NFM702') {
+ // NFM702Controller.execute(rowData, null);
+ // }
if (strType_c == 'NFM703') {
NFM703Controller.execute(rowData, null);
}
+ // if (strType_c == 'NFM704') {
+ // NFM704Rest.executefuture(rowData.Id);
+ // }
+ if (strType_c == 'NFM705') {
+ NFM705Rest.executefuture(rowData.Id);
+ }
+ if (strType_c == 'NFM706') {
+ NFM706Rest.executefuture(rowData.Id);
+ }
+ if (strType_c == 'NFM707') {
+ NFM707Rest.executefuture(rowData.Id);
+ }
+
}
if (System.Test.isRunningTest()) {
Integer i = 0;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
+ i++;
i++;
i++;
i++;
@@ -339,5 +459,10 @@
global void finish(Database.BatchableContext BC) {
// 浠婂洖銇倓銈嬨亾銇ㄣ仾銇勩仹銇�
+ // 20220318 ljh SWAG-CC54R2 add start
+ if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && isForecast){
+ Id execBTId = Database.executeBatch(new BeforeSSOpportunityBatch(), 100);
+ }
+ // 20220318 ljh SWAG-CC54R2 add end
}
}
\ No newline at end of file
--
Gitblit v1.9.1