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/RollupToMaintenanceContractBatch.cls | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/classes/RollupToMaintenanceContractBatch.cls b/force-app/main/default/classes/RollupToMaintenanceContractBatch.cls index 86ab742..287b7e4 100644 --- a/force-app/main/default/classes/RollupToMaintenanceContractBatch.cls +++ b/force-app/main/default/classes/RollupToMaintenanceContractBatch.cls @@ -170,6 +170,8 @@ Maintenance_Contract__r.RecordType_DeveloperName__c, VM_Maintenance_Contract__r.startDateGurantee__c, VM_Maintenance_Contract__r.endDateGurantee__c + ,Agreed_Date__c //鐢ㄦ埛鍚屾剰鏃� 涓婇檺鍚堝悓 LY 20230210 add + ,Limit_Price__c //涓婇檺淇悊 涓婇檺鍚堝悓 LY 20230210 add from Repair__c where (Maintenance_Contract__c != null or VM_Maintenance_Contract__c != null) and (Maintenance_Contract__c in: mcList or VM_Maintenance_Contract__c in: mcList) @@ -197,9 +199,18 @@ if (mc.Sum_repair_price_new__c == null) { mc.Sum_repair_price_new__c = 0.00; } - if (dTDate >= dSDate && dTDate <= dEDate) { - mc.Sum_repair_price_new__c += rc.Usage_Ratio_Price__c == null ? 0 : rc.Usage_Ratio_Price__c; + if (dTDate >= dSDate && dTDate <= dEDate) { + //涓婇檺鍚堝悓 LY 20230210 start + if (rc.Limit_Price__c == true) { + if (rc.Agreed_Date__c!=null) {//鎶ヤ环鍚屾剰鍚� 淇悊鐨勩�愯鍏ュ悎鍚屾秷璐圭巼鐨勪慨鐞嗛噾棰濄�戣鍏ュ埌缁翠慨鍚堝悓鐨勫悎鍚屾湡闂翠慨鐞嗛噾棰濄�� 涓婇檺鍚堝悓 LY add 20230210 + mc.Sum_repair_price_new__c += rc.Usage_Ratio_Price__c == null ? 0 : rc.Usage_Ratio_Price__c; + } + }else{ + mc.Sum_repair_price_new__c += rc.Usage_Ratio_Price__c == null ? 0 : rc.Usage_Ratio_Price__c; + } + //涓婇檺鍚堝悓 LY 20230210 end } + System.debug('淇悊閲戦缁撴潫'+mc.Sum_repair_price_new__c); updateMC.put(rc.Maintenance_Contract__c, mc); } //20210106 zh LJPH-BWM5HM 澶氬勾淇濅慨銆愬悎鍚屾湡闂翠慨鐞嗛噾棰濄�戦�昏緫淇敼 start -- Gitblit v1.9.1