From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/EquipmentRenewTargetBatch.cls | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentRenewTargetBatch.cls b/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
index aa26b3b..ff205a1 100644
--- a/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
+++ b/force-app/main/default/classes/EquipmentRenewTargetBatch.cls
@@ -52,7 +52,7 @@
if (accountIdList != null && accountIdList.size() > 0) {
// 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
query ='select Id,Hospital__c,CurrentContract_F__r.IF_Target_Renew__c,CurrentContract__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Start_Date__c,Product2.ServiceCategory__c,CurrentContract__r.Status__c,Product2.Category3__c,Product2.Category4__c'
- + ' from Asset where IF_Parts_production__c != \'1\' and Hospital__c in :accountIdList and Product2.ServiceCategory__c != null'
+ + ' from Asset where IF_StopParts_production__c != \'1\' and Hospital__c in :accountIdList and Product2.ServiceCategory__c != null'
// 娴嬭瘯涓嶅紑鍚�
+' and CurrentContract_F__r.IF_Target_Renew__c = \'1\''
+ ' and ((CurrentContract__r.Contract_End_Date__c>= :start_date1 and CurrentContract__r.Contract_End_Date__c<= :end_date1) '
@@ -60,7 +60,7 @@
}else{
// 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
query ='select Id,Hospital__c,CurrentContract_F__r.IF_Target_Renew__c,CurrentContract__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Start_Date__c,Product2.ServiceCategory__c,CurrentContract__r.Status__c,Product2.Category3__c,Product2.Category4__c'
- + ' from Asset where IF_Parts_production__c != \'1\' and Product2.ServiceCategory__c != null '
+ + ' from Asset where IF_StopParts_production__c != \'1\' and Product2.ServiceCategory__c != null '
// 娴嬭瘯涓嶅紑鍚�
+' and CurrentContract_F__r.IF_Target_Renew__c = \'1\''
+ ' and ((CurrentContract__r.Contract_End_Date__c>= :start_date1 and CurrentContract__r.Contract_End_Date__c<= :end_date1) '
@@ -161,6 +161,7 @@
}
if (AssetsTarget!=null) {
try {
+ Oly_TriggerHandler.bypass('AssetTrigger');
update AssetsTarget;
}
catch (Exception e) {
--
Gitblit v1.9.1