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/LogAutoSendBatch.cls | 144 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/LogAutoSendBatch.cls b/force-app/main/default/classes/LogAutoSendBatch.cls
index d3fb1e2..57ffcbd 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;
@@ -23,8 +29,21 @@
global Database.QueryLocator start(Database.BatchableContext BC) {
String profileId = UserInfo.getProfileId();
+ // 20220318 ljh SWAG-CC54R2 add start
+ if(String.isNotBlank(typeNFM) && typeNFM == 'NFM010' && String.isBlank(messageGroupNumber)){
+ 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 ]
+ );
+ } 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) {
+ // if (String.isNotBlank(typeNFM) && String.isNotBlank(messageGroupNumber) && times != null) {
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,
@@ -153,6 +172,11 @@
NFM114Rest.main(rowData.Id);
}
// 2021/12/1 fxk add End
+ // // 鐢靛瓙绛炬敹鍗曞彂閫丼AP鎺ュ彛 thh 20220427 start
+ if (strType_c == 'NFM116') {
+ NFM116Controller.execute(rowData,null);
+ }
+ // // 鐢靛瓙绛炬敹鍗曞彂閫丼AP鎺ュ彛 thh 20220427 end
// 涓夋柟鎺ュ彛
if (strType_c == 'NFM201') {
NFM201Controller.execute(rowData, null);
@@ -202,6 +226,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 +237,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 +262,107 @@
if (strType_c == 'NFM621') {
NFM621Controller.execute(rowData, null);
}
- if (strType_c == 'NFM624') {
+ 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.ManualExecute(rowData.id);
}
+ if (strType_c == 'NFM113') {//鍏堟鍚庝慨pk
+ NFM113Rest.main(rowData.id);
+ }
+ 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.main(rowData.Id);
+ }
+ if (strType_c == 'NFM706') {
+ NFM706Rest.main(rowData.Id);
+ }
+ if (strType_c == 'NFM707') {
+ NFM707Rest.main(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 +466,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