From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份
---
force-app/main/default/classes/LogAutoSendBatch.cls | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index 57ffcbd..4533ae6 100644
--- a/force-app/main/default/classes/LogAutoSendBatch.cls
+++ b/force-app/main/default/classes/LogAutoSendBatch.cls
@@ -4,10 +4,14 @@
private String messageGroupNumber;
private Datetime times;
private Boolean isForecast;// 20220318 ljh SWAG-CC54R2 add
+ private String loginId;
/**
* 銈炽兂銈广偪銉炽儓
*/
global LogAutoSendBatch() {
+ }
+ global LogAutoSendBatch(String loginId) {
+ this.loginId = loginId;
}
// 20220318 ljh SWAG-CC54R2 add start
global LogAutoSendBatch(String type,Boolean isForecast) {
@@ -40,7 +44,21 @@
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 ]
);
- } else if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
+ }
+ // gzw 603 閲嶅彂鍒ゆ柇 鏆傛椂鐢�
+ else if (String.isNotBlank(loginId)) {
+ 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 id = : loginId ]
+ );
+ }
+ // gzw 603 閲嶅彂鍒ゆ柇 鏆傛椂鐢�
+
+ else if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
// 20220318 ljh SWAG-CC54R2 add end
//20191224 HWAG-BK65E8 add start
// if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
@@ -67,7 +85,7 @@
OR(NFM501_Web_Annex_Count__c != null
AND NFM501_Web_Annex_Count__c > 0 AND NFM501_Web_Annex_Count__c < : max_cnt))]
);
- } else {
+ }else {
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,
@@ -177,6 +195,11 @@
NFM116Controller.execute(rowData,null);
}
// // 鐢靛瓙绛炬敹鍗曞彂閫丼AP鎺ュ彛 thh 20220427 end
+ // XLIU-CEW9PD 闆朵欢棰勮榻愬鏃ユ湡 -SFDC澧炲姞 LY 20220610 start
+ if (strType_c == 'NFM117') {
+ NFM117Rest.main(rowData.Id);
+ }
+ // XLIU-CEW9PD 闆朵欢棰勮榻愬鏃ユ湡 -SFDC澧炲姞 LY 20220610 end
// 涓夋柟鎺ュ彛
if (strType_c == 'NFM201') {
NFM201Controller.execute(rowData, null);
@@ -277,14 +300,14 @@
if (strType_c == 'NFM701') {
NFM701Controller.execute(rowData, null);
}
- // if (strType_c == 'NFM702') {
- // NFM702Controller.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);
+ NFM704Rest.main(rowData.Id);
}
if (strType_c == 'NFM705') {
NFM705Rest.main(rowData.Id);
--
Gitblit v1.9.1