From 6170f820835aad4bb52596e7c0083e554987b354 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 22 三月 2022 18:24:13 +0800
Subject: [PATCH] 黄千龙20220322:1824更新KPI覆盖率
---
force-app/main/default/classes/EquipmentCoverageTargetBatch.cls | 152 ++++++++++++------------
force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls | 151 +++++++++++++-----------
2 files changed, 157 insertions(+), 146 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
index 52f19e1..5283998 100644
--- a/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
+++ b/force-app/main/default/classes/EquipmentCoverageTargetBatch.cls
@@ -2,19 +2,18 @@
@Author: 榛勫崈榫�
@Name: EquipmentCoverageTargetBatch
@CreateDate: 22/03/2022
-@Description: 鏄惁瑕嗙洊鐜囩洰鏍囷紙鍒嗘瘝锛�
+@Description: 鏄惁瑕嗙洊鐜囧疄闄咃紙鍒嗗瓙锛�
@Version 1.0
*****************************************************************************************************/
-global class EquipmentCoverageTargetBatch implements Database.Batchable<sObject>,Database.Stateful {
+global class EquipmentRealCoverageRealBatch implements Database.Batchable<sObject>,Database.Stateful {
public String query;
public Date start_dateH1 ;
public Date end_dateH1 ;
- public List<Id> hospIds = new List<Id>();
public Date toDayTime = Date.today();
+ private BatchIF_Log__c iflog;
public String OCSM_Period_half;
public String OCSM_Period = 'FY'+toDayTime.year();
- private BatchIF_Log__c iflog;
- global EquipmentCoverageTargetBatch() {
+ global EquipmentRealCoverageRealBatch() {
this.query = query;
iflog = new BatchIF_Log__c();
iflog.Type__c = 'PushNotification';
@@ -26,40 +25,34 @@
}else{
OCSM_Period_half = '2H';
}
-
-
}
-
+
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');
- 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 Hospital__c in :hospIds and Product2.ServiceCategory__c != null and Status != \'寤冩\' and Status != \'寰呮姤搴焅' and CurrentContract__c != null'
- +' 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';
-
- // 5鏉′互涓婅蒋鎬ч暅鍖婚櫌&&鍖婚櫌鏈夋晥
- Date egdTime = Date.newInstance(toDayTime.year()+1,3,1);
- List<AggregateResult> Asset1 = [select count(Id),Hospital__c from asset where Product2.ServiceCategory__c ='杞�ч暅' Group by Hospital__c having count(Id)>=5];
- if(Asset1!=null){
- for (AggregateResult a1 : Asset1) {
- hospIds.add(String.valueOf(a1.get('Hospital__c')));
- }
- }
-
+ system.debug('鎵цstart');
+ 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 (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
+ // 瀹為檯璁惧鍚堝悓鏃堕棿鍖洪棿1H(4,9);2H(10,3)
+ if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
+ start_dateH1 = Date.newInstance(toDayTime.year(),9,1);
+ 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);
+ }
return Database.getQueryLocator(query);
}
global void execute(Database.BatchableContext BC, list<Asset> Assets) {
- // List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
+
+ 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);
+ for (Asset ass : Assets) {
+ accIds.add(ass.Hospital__c);
}
- 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
+ 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
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];
@@ -71,62 +64,69 @@
}
}
}
- }
- List<Asset> AssetsTarget = new List<Asset>();
+ }
+
+
+ List<Asset> AssetsReal = 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);
-
+ // 瀹為檯瑕嗙洊鏁帮紙纭級锛氭硨灏跨鐢ㄧ‖鎬ч暅
+ Integer mirror_4 = 0;
+ // 瀹為檯瑕嗙洊鏁帮紙纭級锛氬绉戠敤纭�ч暅
+ Integer mirror_5 = 0;
+ // 瀹為檯瑕嗙洊鏁帮紙鍛ㄨ竟锛夛細鍏夋簮
+ Integer mirror_6 = 0;
+ // 瀹為檯瑕嗙洊鏁帮紙杞級锛氱數瀛愰暅
+ Integer mirror_7 = 0;
+ // 鏍囪鏄惁瑕嗙洊鐜囧疄闄呰澶�
+ ass1.IF_Coverage_Real_Asset__c = '1';
+ AssetsReal.add(ass1);
if (ass1.Product2.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
- mirror_1++;
+ mirror_4++;
}
- if(ass1.Product2.ServiceCategory__c =='杞�ч暅'){
- mirror_2++;
+ if (ass1.Product2.Category4__c == '濡囩鐢ㄧ‖鎬ч暅') {
+ mirror_5++;
}
if (ass1.Product2.Category3__c == '鍏夋簮') {
- mirror_3++;
- }
- if (asotMap.containsKey(ass1.Hospital__c)) {
- Account_Service_Of_Target__c asotOne = asotMap.get(ass1.Hospital__c);
- system.debug('asotOne=='+ asotOne);
- 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;
- update asotOne;
+ mirror_6++;
+ }
+ if (ass1.Product2.ServiceCategory__c =='杞�ч暅') {
+ mirror_7++;
+ }
+ if (asotMap.containsKey(ass1.hospital__c)) {
+ Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
+ asotOne = asotMap.get(ass1.hospital__c);
+ asotOne.Finish_Rigid_Mirror_2__c += mirror_4;
+ asotOne.Finish_Rigid_Mirror_3__c += mirror_5;
+ asotOne.Finish_Correlation_Lightsource__c += mirror_6;
+ asotOne.Finish_Rigid_Mirror_1__c += mirror_7;
+ 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;
+ asot1.Account_HP__c = ass1.hospital__c;
+ asot1.Finish_Rigid_Mirror_2__c = mirror_4;
+ asot1.Finish_Rigid_Mirror_3__c = mirror_5;
+ asot1.Finish_Correlation_Lightsource__c = mirror_6;
+ asot1.Finish_Rigid_Mirror_1__c = mirror_7;
+ asot1.OCSM_Period__c = OCSM_Period;
+ asot1.OCSM_Period_half__c = OCSM_Period_half;
asotMap.put(ass1.hospital__c,asot1);
- insert asot1;
-
+ if (!asots.contains(asot1)) {
+ asots.add(asot1);
+ }
}
}
- system.debug('map=='+asotMap);
- if (AssetsTarget!=null) {
- try {
- system.debug('鎵цupdate');
- Oly_TriggerHandler.bypass('AssetTrigger');
- update AssetsTarget;
- }
- catch (Exception e) {
- iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsTarget:'+']'+e.getMessage()+'\n';
- }
- }
-
+ upsert asots;
+ system.debug('杩欎釜闆嗗悎锛欰ssetsReal ==='+AssetsReal);
+ if (AssetsReal!=null) {
+ try {
+ update AssetsReal;
+ }
+ catch (Exception e) {
+ iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsReal:'+']'+e.getMessage()+'\n';
+ }
+ }
}
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 09ebf56..22f77b2 100644
--- a/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
+++ b/force-app/main/default/classes/EquipmentRealCoverageRealBatch.cls
@@ -2,18 +2,19 @@
@Author: 榛勫崈榫�
@Name: EquipmentCoverageTargetBatch
@CreateDate: 22/03/2022
-@Description: 鏄惁瑕嗙洊鐜囧疄闄咃紙鍒嗗瓙锛�
+@Description: 鏄惁瑕嗙洊鐜囩洰鏍囷紙鍒嗘瘝锛�
@Version 1.0
*****************************************************************************************************/
-global class EquipmentRealCoverageRealBatch implements Database.Batchable<sObject>,Database.Stateful {
+global class EquipmentCoverageTargetBatch implements Database.Batchable<sObject>,Database.Stateful {
public String query;
public Date start_dateH1 ;
public Date end_dateH1 ;
+ public List<Id> hospIds = new List<Id>();
public Date toDayTime = Date.today();
- private BatchIF_Log__c iflog;
public String OCSM_Period_half;
public String OCSM_Period = 'FY'+toDayTime.year();
- global EquipmentRealCoverageRealBatch() {
+ private BatchIF_Log__c iflog;
+ global EquipmentCoverageTargetBatch() {
this.query = query;
iflog = new BatchIF_Log__c();
iflog.Type__c = 'PushNotification';
@@ -25,33 +26,42 @@
}else{
OCSM_Period_half = '2H';
}
+
+
}
-
+
global Database.QueryLocator start(Database.BatchableContext bc) {
- system.debug('鎵цstart');
- 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 (CurrentContract__r.Contract_End_Date__c >= :start_dateH1 and CurrentContract__r.Contract_Conclusion_Date__c <= :end_dateH1) order by hospital__c';
- // 瀹為檯璁惧鍚堝悓鏃堕棿鍖洪棿1H(4,9);2H(10,3)
- if (toDayTime.month() >= 4 && toDayTime.month() <= 9) {
- start_dateH1 = Date.newInstance(toDayTime.year(),9,1);
- 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);
- }
+ // 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');
+ 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 Hospital__c in :hospIds and Product2.ServiceCategory__c != null and Status != \'寤冩\' and Status != \'寰呮姤搴焅' and CurrentContract__c != null'
+ +' 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';
+
+ // 5鏉′互涓婅蒋鎬ч暅鍖婚櫌&&鍖婚櫌鏈夋晥
+ Date egdTime = Date.newInstance(toDayTime.year()+1,3,1);
+ List<AggregateResult> Asset1 = [select count(Id),Hospital__c from asset where Product2.ServiceCategory__c ='杞�ч暅' Group by Hospital__c having count(Id)>=5];
+ if(Asset1!=null){
+ for (AggregateResult a1 : Asset1) {
+ hospIds.add(String.valueOf(a1.get('Hospital__c')));
+ }
+ }
+
return Database.getQueryLocator(query);
}
global void execute(Database.BatchableContext BC, list<Asset> Assets) {
-
- // List<Account_Service_Of_Target__c> asots = new List<Account_Service_Of_Target__c>();
+ 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 ass : Assets) {
- accIds.add(ass.Hospital__c);
+
+ for (Asset ass1 : Assets) {
+ accIds.add(ass1.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,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];
@@ -63,64 +73,65 @@
}
}
}
- }
-
-
- List<Asset> AssetsReal = new List<Asset>();
+ }
+ List<Asset> AssetsTarget = new List<Asset>();
for (Asset ass1 : Assets) {
- // 瀹為檯瑕嗙洊鏁帮紙纭級锛氭硨灏跨鐢ㄧ‖鎬ч暅
- Integer mirror_4 = 0;
- // 瀹為檯瑕嗙洊鏁帮紙纭級锛氬绉戠敤纭�ч暅
- Integer mirror_5 = 0;
- // 瀹為檯瑕嗙洊鏁帮紙鍛ㄨ竟锛夛細鍏夋簮
- Integer mirror_6 = 0;
- // 瀹為檯瑕嗙洊鏁帮紙杞級锛氱數瀛愰暅
- Integer mirror_7 = 0;
- // 鏍囪鏄惁瑕嗙洊鐜囧疄闄呰澶�
- ass1.IF_Coverage_Real_Asset__c = '1';
- AssetsReal.add(ass1);
+ // 瑕嗙洊鐩爣锛堢‖锛夛細娉屽翱绉戠敤纭�ч暅
+ 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.Category4__c == '娉屽翱绉戠敤纭�ч暅') {
- mirror_4++;
+ mirror_1++;
}
- if (ass1.Product2.Category4__c == '濡囩鐢ㄧ‖鎬ч暅') {
- mirror_5++;
+ if(ass1.Product2.ServiceCategory__c =='杞�ч暅'){
+ mirror_2++;
}
if (ass1.Product2.Category3__c == '鍏夋簮') {
- mirror_6++;
- }
- if (ass1.Product2.ServiceCategory__c =='杞�ч暅') {
- mirror_7++;
- }
- if (asotMap.containsKey(ass1.hospital__c)) {
- Account_Service_Of_Target__c asotOne = new Account_Service_Of_Target__c();
- asotOne = asotMap.get(ass1.hospital__c);
- asotOne.Finish_Rigid_Mirror_2__c += mirror_4;
- asotOne.Finish_Rigid_Mirror_3__c += mirror_5;
- asotOne.Finish_Correlation_Lightsource__c += mirror_6;
- asotOne.Finish_Rigid_Mirror_1__c += mirror_7;
- update asotOne;
+ mirror_3++;
+ }
+ if (asotMap.containsKey(ass1.Hospital__c)) {
+ Account_Service_Of_Target__c asotOne = asotMap.get(ass1.Hospital__c);
+ system.debug('asotOne=='+ asotOne);
+ 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.Finish_Rigid_Mirror_2__c = mirror_4;
- asot1.Finish_Rigid_Mirror_3__c = mirror_5;
- asot1.Finish_Correlation_Lightsource__c = mirror_6;
- asot1.Finish_Rigid_Mirror_1__c = mirror_7;
- asot1.OCSM_Period__c = OCSM_Period;
- asot1.OCSM_Period_half__c = OCSM_Period_half;
+ 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);
- insert asot1;
+ if (!asots.contains(asot1)) {
+ asots.add(asot1);
+ }
}
}
- system.debug('杩欎釜闆嗗悎锛欰ssetsReal ==='+AssetsReal);
- if (AssetsReal!=null) {
- try {
- update AssetsReal;
- }
- catch (Exception e) {
- iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsReal:'+']'+e.getMessage()+'\n';
- }
- }
+ UpSert asots;
+ if (AssetsTarget!=null) {
+ try {
+ system.debug('鎵цupdate');
+ Oly_TriggerHandler.bypass('AssetTrigger');
+ update AssetsTarget;
+ }
+ catch (Exception e) {
+ iflog.ErrorLog__c += 'ERROR'+'['+'update AssetsTarget:'+']'+e.getMessage()+'\n';
+ }
+ }
+
}
global void finish(Database.BatchableContext BC) {
--
Gitblit v1.9.1