From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/TypeMaintenanceContractBatch.cls | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/classes/TypeMaintenanceContractBatch.cls b/force-app/main/default/classes/TypeMaintenanceContractBatch.cls
index b3ff24b..3b9abf2 100644
--- a/force-app/main/default/classes/TypeMaintenanceContractBatch.cls
+++ b/force-app/main/default/classes/TypeMaintenanceContractBatch.cls
@@ -26,8 +26,7 @@
}
// 閫氳繃淇濇湁璁惧鏌ユ墍鏈夌淮淇悎鍚�/淇濇湁璁惧
- List<Maintenance_Contract_Asset__c> mcaList=[select id,Asset__c,Asset__r.name,asset__r.InstallDate,Asset__r.CurrentContract_F__c,Maintenance_Contract__r.name,Maintenance_Contract__r.Contract_Start_Date__c, Maintenance_Contract__r.Contract_end_Date__c from Maintenance_Contract_Asset__c where Asset__c in : astIdList and Maintenance_Contract__r.RecordTypeId!='01210000000gTYv' and Maintenance_Contract__r.Status__c in ('濂戠磩','濂戠磩婧�浜�','鍚堝悓缁撴潫','鍚堝悓涓�') and Maintenance_Contract__c!='a0H1000000aeiFP' order by asset__c, Maintenance_Contract__r.Contract_Start_Date__c];
- system.debug('mcaList绛変簬'+mcaList);
+ List<Maintenance_Contract_Asset__c> mcaList=[select id,Asset__c,Asset__r.name,asset__r.InstallDate,Asset__r.CurrentContract_F__c,Maintenance_Contract__r.name,Maintenance_Contract__r.Contract_Start_Date__c, Maintenance_Contract__r.Contract_end_Date__c from Maintenance_Contract_Asset__c where Asset__c in : astIdList and Maintenance_Contract__r.RecordTypeId!='01210000000gTYv' and Maintenance_Contract__r.Status__c in ('濂戠磩','濂戠磩婧�浜�') and Maintenance_Contract__c!='a0H1000000aeiFP' order by asset__c, Maintenance_Contract__r.Contract_Start_Date__c];
List<String> astList=new List<String>(); //浣滀负鍒ゆ柇淇濇湁璁惧鏄惁瀛樺湪
List<String> firstList=new List<String>();
for (Maintenance_Contract_Asset__c mcai : mcaList) {
@@ -42,23 +41,27 @@
Date startDate=mcaj.Maintenance_Contract__r.Contract_Start_Date__c; //寮�濮嬫棩
Date endDate=mcaj.Maintenance_Contract__r.Contract_end_Date__c; //缁撴潫鏃�
+ if (installDate==null) {
+ mcaj.New_Contract_TypeF__c='棣栫鍚堝悓';
+ lastEndDate=mcaj.Maintenance_Contract__r.Contract_end_Date__c;
+ i++;
+ continue;
+ }
+
// 娌℃湁鍚屾湡涓殑涓婃湡鍚堝悓
if (i==0) {
- if (installDate==null) {
- mcaj.New_Contract_TypeF__c='棣栫璁惧';
- // lastEndDate=mcaj.Maintenance_Contract__r.Contract_end_Date__c;
- // 涓斿綋鏈熷悎鍚岀殑瀹夎鏃ュ皬浜庡悎鍚屽紑濮嬫棩涓斿湪鍗婂勾浠ュ唴锛屽垽鏂负鏂板搧鍚堝悓
- }else if (installDate.monthsBetween(startDate)<=6&&installDate.monthsBetween(startDate)>=0) {
- mcaj.New_Contract_TypeF__c='鏂板搧璁惧';
+ // 涓斿綋鏈熷悎鍚岀殑瀹夎鏃ュ皬浜庡悎鍚屽紑濮嬫棩涓斿湪鍗婂勾浠ュ唴锛屽垽鏂负鏂板搧鍚堝悓
+ if (installDate.monthsBetween(startDate)<=6&&installDate.monthsBetween(startDate)>=0) {
+ mcaj.New_Contract_TypeF__c='鏂板搧鍚堝悓';
}else {
// 鍚﹀垯鍒ゆ柇涓洪绛惧悎鍚屻��
- mcaj.New_Contract_TypeF__c='棣栫璁惧';
+ mcaj.New_Contract_TypeF__c='棣栫鍚堝悓';
}
i++;
}else if(lastEndDate.monthsBetween(startDate)<=12) {
- mcaj.New_Contract_TypeF__c='缁璁惧';
+ mcaj.New_Contract_TypeF__c='缁鍚堝悓';
}else {
- mcaj.New_Contract_TypeF__c='闈炵画绛捐澶�';
+ mcaj.New_Contract_TypeF__c='闈炵画绛惧悎鍚�';
}
lastEndDate=mcaj.Maintenance_Contract__r.Contract_end_Date__c;
}
@@ -72,9 +75,6 @@
}
public void finish(Database.BatchableContext BC) {
- if(!System.test.isRunningTest() && IdList == null){
- Database.executeBatch(new Type2MaintenanceContractBatch());
- }
}
}
--
Gitblit v1.9.1