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/EquipmentRealCoverageRealBatch.cls | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls b/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
index 1a8f72f..669036a 100644
--- a/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
+++ b/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
@@ -35,11 +35,11 @@
}
if (accountIdList != null && accountIdList.size() > 0) {
query = 'select id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset where '
- +' IF_Parts_production__c != \'1\' and CurrentContract__c != null and Hospital__c in :accountIdList'
+ +' IF_StopParts_production__c != \'1\' and CurrentContract__c != null and Hospital__c in :accountIdList'
+' and (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
}else{
query = 'select id,Hospital__c,IF_Coverage_Target_Asset__c,IF_Coverage_Real_Asset__c,CurrentContract__r.Contract_End_Date__c,CurrentContract__r.Contract_Conclusion_Date__c,Product2.Category4__c,Product2.ServiceCategory__c,Product2.Category3__c from Asset where '
- +' IF_Parts_production__c != \'1\' and CurrentContract__c != null'
+ +' IF_StopParts_production__c != \'1\' and CurrentContract__c != null'
+' and (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
}
@@ -49,7 +49,7 @@
end_dateH1 = Date.newInstance(toDayTime.year(),9,30);
}else{
start_dateH1 = Date.newInstance(toDayTime.year(),3,1);
- end_dateH1 = Date.newInstance(toDayTime.year()+1,3,31);
+ end_dateH1 = Date.newInstance(toDayTime.year(),3,31);
}
return Database.getQueryLocator(query);
}
@@ -63,7 +63,7 @@
for (Asset ass : Assets) {
accIds.add(ass.Hospital__c);
}
- List<Account_Service_Of_Target__c> asotList = [select Id,Finish_Rigid_Mirror_2__c,Finish_Rigid_Mirror_3__c,Finish_Correlation_Lightsource__c,Finish_Rigid_Mirror_1__c,Account_HP__c,OCSM_Period_half__c
+ List<Account_Service_Of_Target__c> asotList = [select Id,Finish_Rigid_Mirror_2__c,Finish_Correlation_Lightsource__c,Finish_Rigid_Mirror_1__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];
@@ -126,6 +126,7 @@
system.debug('杩欎釜闆嗗悎锛欰ssetsReal ==='+AssetsReal);
if (AssetsReal!=null) {
try {
+ Oly_TriggerHandler.bypass('AssetTrigger');
update AssetsReal;
}
catch (Exception e) {
--
Gitblit v1.9.1