From fe7d1b90f57b14ca09852c0e80f58a412b50478d Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:04 +0800
Subject: [PATCH] 20220408KPI覆盖率提交
---
force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls b/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
index f5c1f1d..a579177 100644
--- a/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
+++ b/force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls
@@ -36,12 +36,12 @@
if (accountIdList != null && accountIdList.size() > 0) {
// 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
query = 'select Id,Hospital__c,CurrentContract__c,CurrentContract__r.Contract_Conclusion_Date__c,CurrentContract__r.New_Contract_TypeF_Text__c,Product2.ServiceCategory__c,Product2.Category3__c,Product2.Category4__c'
- +' from Asset where Hospital__c in :accountIdList and IF_Parts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+ +' from Asset where Hospital__c in :accountIdList and IF_StopParts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+' and CurrentContract__r.Contract_Conclusion_Date__c <= :effectiveTime order by hospital__c';
}else{
// 淇濇湁璁惧涓嶄负闆朵欢鍋滀骇
query = 'select Id,Hospital__c,CurrentContract__c,CurrentContract__r.Contract_Conclusion_Date__c,CurrentContract__r.New_Contract_TypeF_Text__c,Product2.ServiceCategory__c,Product2.Category3__c,Product2.Category4__c'
- +' from Asset where IF_Parts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+ +' from Asset where IF_StopParts_production__c != \'1\' and CurrentContract__r.New_Contract_TypeF_Text__c =\'缁鍚堝悓\''
+' and CurrentContract__r.Contract_Conclusion_Date__c <= :effectiveTime order by hospital__c';
}
return Database.getQueryLocator(query);
@@ -55,7 +55,7 @@
for (Asset ass1 : Assets) {
accIds.add(ass1.Hospital__c);
}
- List<Account_Service_Of_Target__c> asotList = [select Id,Renew_Finish_Rigid_Mirror_1__c,Renew_Finish_Rigid_Mirror_2__c,Renew_Finish_Rigid_Mirror_3__c,Renew_Finish_Correlation_Lightsource__c,Renew_Finish_Else__c,Account_HP__c,OCSM_Period_half__c
+ List<Account_Service_Of_Target__c> asotList = [select Id,Renew_Finish_Rigid_Mirror_1__c,Renew_Finish_Rigid_Mirror_3__c,Renew_Finish_Correlation_Lightsource__c,Renew_Finish_Else__c,Account_HP__c,OCSM_Period_half__c
from Account_Service_Of_Target__c
where Account_HP__c in :accIds and OCSM_Period_half__c = :OCSM_Period_half
and OCSM_Period__c = :OCSM_Period];
@@ -129,6 +129,7 @@
}
if (AssetsReal!=null) {
try {
+ Oly_TriggerHandler.bypass('AssetTrigger');
update AssetsReal;
}
catch (Exception e) {
--
Gitblit v1.9.1