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/EquipmentCoverageTargetBatch.cls | 159 +++++++++++++++++++++++++---------------------------
force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls | 9 +-
force-app/main/default/classes/EquipmentRenewMoleculeBatch.cls | 7 +-
force-app/main/default/classes/EquipmentRenewTargetBatch.cls | 5 +
4 files changed, 89 insertions(+), 91 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
index 1e0b322..04221b3 100644
--- a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
+++ b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
@@ -12,11 +12,13 @@
public List<Id> hospIds = new List<Id>();
public Date toDayTime = Date.today();
public String OCSM_Period_half;
- public String OCSM_Period = 'FY'+toDayTime.year();
+ public String OCSM_Period;
private BatchIF_Log__c iflog;
public List < String > accountIdList;
+ public Date egdTime;
global EquipmentCoverageTargetBatch() {
this.query = query;
+ OCSM_Period = 'FY'+toDayTime.year();
}
global EquipmentCoverageTargetBatch(List < String > accountIdList) {
@@ -25,10 +27,7 @@
}
global Database.QueryLocator start(Database.BatchableContext bc) {
- // query = 'select Id,(select id,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_Hospital__r where Status != \'寤冩\' and Status != \'寰呮姤搴焅''
- // +' and IF_Parts_production__c != \'1\''
- // +' and ((SerMarGuranteeType__c != \'鏈嶅姟澶氬勾淇濅慨\' and SerMarGuranteeType__c != \'甯傚満澶氬勾淇濅慨\') or Extend_Gurantee_DateTo__c >= :egdTime)'
- // +' and Product2.ServiceCategory__c != null) from Account where id in :hospIds';
+
system.debug('鎵цstart');
iflog = new BatchIF_Log__c();
iflog.Type__c = 'PushNotification';
@@ -41,107 +40,103 @@
OCSM_Period_half = '2H';
}
// 5鏉′互涓婅蒋鎬ч暅鍖婚櫌&&鍖婚櫌鏈夋晥
- Date egdTime = Date.newInstance(toDayTime.year()+1,3,1);
- List<AggregateResult> Asset1 = new List<AggregateResult>();
+ egdTime = Date.newInstance(toDayTime.year()+1,3,1);
+ List<AggregateResult> results = new List<AggregateResult>();
+
+ String groupQuery = 'SELECT count(Id),Hospital__c'
+ + ' FROM Asset'
+ + ' WHERE Product2.ServiceCategory__c =\'杞�ч暅\' AND Is_Active__c =\'鏈夊姽\' AND RecordType.DeveloperName =\'HP\' ';
if (accountIdList != null && accountIdList.size() > 0) {
- Asset1 = [select count(Id),Hospital__c from asset where Hospital__c IN :accountIdList and Product2.ServiceCategory__c ='杞�ч暅' Group by Hospital__c having count(Id)>=5];
- }else{
- Asset1 = [select count(Id),Hospital__c from asset where Product2.ServiceCategory__c ='杞�ч暅' Group by Hospital__c having count(Id)>=5];
+ groupQuery += ' AND Hospital__c IN :accountIdList';
}
+ groupQuery += ' Group by Hospital__c having count(Id)>=5';
- if(Asset1!=null && Asset1.size() > 0){
- for (AggregateResult a1 : Asset1) {
+ System.debug(LoggingLevel.INFO, '*** groupQuery: ' + groupQuery);
+ results = Database.query(groupQuery);
+ if(results!=null && results.size() > 0){
+ for (AggregateResult a1 : results) {
hospIds.add(String.valueOf(a1.get('Hospital__c')));
}
}
- query = 'select Id,Hospital__c,Hospital__r.IF_Coverage_Target_HP__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 Hospital__c in :hospIds and Product2.ServiceCategory__c != null and Status != \'寤冩\' and Status != \'寰呮姤搴焅''
- +' and IF_Parts_production__c != \'1\' and SerMarGuranteeType__c = null and (Extend_Gurantee_DateTo__c = null or Extend_Gurantee_DateTo__c < :egdTime) order by hospital__c';
- return Database.getQueryLocator(query);
+ return Database.getQueryLocator([SELECT Id,IF_Coverage_Target_HP__c,
+ (SELECT Id,Hospital__c,Hospital__r.IF_Coverage_Target_HP__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_Hospital__r
+ WHERE Product2.ServiceCategory__c != null
+ AND Product2.Maintenance_Price_Year__c != 0
+ AND Status != '寤冩'
+ AND Status != '寰呮姤搴�'
+ AND IF_StopParts_production__c != '1'
+ AND ((SerMarGuranteeType__c = null AND Extend_Gurantee_DateTo__c = null)
+ OR (SerMarGuranteeType__c!=null AND Extend_Gurantee_DateTo__c < :egdTime)
+ OR CurrentContract__c = null) ) ,
+ (SELECT Id ,Target_Rigid_Mirror_2__c,Target_Soft_Mirror_2__c,Target_Correlation_Lightsource__c,Account_HP__c,OCSM_Period_half__c
+ FROM Account_Servicetarget__r
+ WHERE OCSM_Period_half__c = :OCSM_Period_half
+ AND OCSM_Period__c = :OCSM_Period)
+ FROM Account WHERE Id IN:hospIds]);
}
- global void execute(Database.BatchableContext BC, list<Asset> Assets) {
+ global void execute(Database.BatchableContext BC, list<Account> accList) {
system.debug('鎵цexecute');
- List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
- // List<Account_Service_Of_Target__c> asotsIN = new List<Account_Service_Of_Target__c>();
- List<Id> accIds = new List<Id>();
- Map<String,Account_Service_Of_Target__c> asotMap = new Map<String,Account_Service_Of_Target__c>();
- for (Asset ass1 : Assets) {
- accIds.add(ass1.Hospital__c);
- }
- List<Account> accList = [select id from Account where id in :accIds];
- for (Account acc : accList) {
- // 鏍囪鏄惁瑕嗙洊鐜囩洰鏍囧尰闄�
+ List<Asset> assetList = new List<Asset>();
+ List<Account_Service_Of_Target__c> targetObjs = new List<Account_Service_Of_Target__c>();
+ for(Account acc:accList){
acc.IF_Coverage_Target_HP__c = '1';
- }
- List<Account_Service_Of_Target__c> asotList = [select Id,Target_Rigid_Mirror_2__c,Target_Soft_Mirror_2__c,Target_Correlation_Lightsource__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];
- if (asotList != null) {
- for (Account_Service_Of_Target__c asot : asotList) {
- for (Id accid : accIds) {
- if (asot.Account_HP__c == accid) {
- asotMap.put(accid,asot);
- }
- }
- }
- }
- List<Asset> AssetsTarget = new List<Asset>();
- for (Asset ass1 : Assets) {
- // 瑕嗙洊鐩爣锛堢‖锛�
- Integer mirror_1 = 0;
- // 瑕嗙洊鐩爣锛堣蒋锛�
- Integer mirror_2 = 0;
- //瑕嗙洊鐩爣锛堝懆杈癸級
- Integer mirror_3 = 0;
- // 鏍囪鏄惁瑕嗙洊鐜囩洰鏍囪澶�
- ass1.IF_Coverage_Target_Asset__c = '1';
- AssetsTarget.add(ass1);
-
- if (ass1.Product2.ServiceCategory__c == '纭�ч暅') {
+ // 瑕嗙洊鐩爣锛堢‖锛�
+ Integer mirror_1 = 0;
+ // 瑕嗙洊鐩爣锛堣蒋锛�
+ Integer mirror_2 = 0;
+ //瑕嗙洊鐩爣锛堝懆杈癸級
+ Integer mirror_3 = 0;
+ for(Asset ass: acc.Asset_Hospital__r){
+ ass.IF_Coverage_Target_Asset__c = '1';
+ assetList.add(ass);
+ if (ass.Product2.ServiceCategory__c == '纭�ч暅') {
mirror_1++;
}
- if(ass1.Product2.ServiceCategory__c =='杞�ч暅'){
+ if(ass.Product2.ServiceCategory__c =='杞�ч暅'){
mirror_2++;
}
- if (ass1.Product2.ServiceCategory__c == '鍛ㄨ竟') {
+ if (ass.Product2.ServiceCategory__c == '鍛ㄨ竟') {
mirror_3++;
}
- if (asotMap.containsKey(ass1.Hospital__c)) {
- Account_Service_Of_Target__c asotOne = asotMap.get(ass1.Hospital__c);
- system.debug('asotOne=='+ asotOne);
+ }
+ System.debug(LoggingLevel.INFO, '*** mirror_1: ' + mirror_1);
+ System.debug(LoggingLevel.INFO, '*** mirror_2: ' + mirror_2);
+ System.debug(LoggingLevel.INFO, '*** mirror_3: ' + mirror_3);
+ if(acc.Account_Servicetarget__r.size() > 0){
+
+ for(Account_Service_Of_Target__c asotOne: acc.Account_Servicetarget__r){
asotOne.Coverage_Target_Account__c = true;
asotOne.Target_Rigid_Mirror_2__c += mirror_1;
asotOne.Target_Soft_Mirror_2__c += mirror_2;
asotOne.Target_Correlation_Lightsource__c += mirror_3;
- if (!asots.contains(asotOne)) {
- asots.add(asotOne);
- }
- }else{
- Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
- asot1.Account_HP__c = ass1.Hospital__c;
- asot1.Coverage_Target_Account__c = true;
- asot1.Target_Rigid_Mirror_2__c = mirror_1;
- asot1.Target_Soft_Mirror_2__c = mirror_2;
- asot1.Target_Correlation_Lightsource__c = mirror_3;
- asot1.OCSM_Period__c = OCSM_Period;
- asot1.OCSM_Period_half__c = OCSM_Period_half;
- asotMap.put(ass1.hospital__c,asot1);
- if (!asots.contains(asot1)) {
- asots.add(asot1);
- }
+ targetObjs.add(asotOne);
}
+ }else{
+ Account_Service_Of_Target__c asot1 = new Account_Service_Of_Target__c();
+ asot1.Account_HP__c = acc.Id;
+ asot1.Coverage_Target_Account__c = true;
+ asot1.Target_Rigid_Mirror_2__c = mirror_1;
+ asot1.Target_Soft_Mirror_2__c = mirror_2;
+ asot1.Target_Correlation_Lightsource__c = mirror_3;
+ asot1.OCSM_Period__c = OCSM_Period;
+ asot1.OCSM_Period_half__c = OCSM_Period_half;
+ targetObjs.add(asot1);
}
- UpSert asots;
- Oly_TriggerHandler.bypass('AssetTrigger');
- system.debug('鎵цupdate AssetsTarget鍓�');
- update AssetsTarget;
- system.debug('鎵цupdate accList鍓�');
- Oly_TriggerHandler.bypass('AccountTrigger');
- update accList;
+ }
+
+ Oly_TriggerHandler.bypass('AssetTrigger');
+ system.debug('鎵цupdate AssetsTarget鍓�');
+ update assetList;
+ system.debug('鎵цupdate accList鍓�');
+ Oly_TriggerHandler.bypass('AccountTrigger');
+ update accList;
+ UpSert targetObjs;
}
global void finish(Database.BatchableContext BC) {
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) {
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) {
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