From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001 From: 高章伟 <gaozhangwei@prec-tech.com> Date: 星期四, 02 三月 2023 17:51:57 +0800 Subject: [PATCH] gzw 正式环境最新代码更新 --- force-app/main/default/classes/LostCancelReportOppBatch.cls | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/force-app/main/default/classes/LostCancelReportOppBatch.cls b/force-app/main/default/classes/LostCancelReportOppBatch.cls index f8a4b65..72442ae 100644 --- a/force-app/main/default/classes/LostCancelReportOppBatch.cls +++ b/force-app/main/default/classes/LostCancelReportOppBatch.cls @@ -157,6 +157,7 @@ PCLLostBrand__r.AgencyMannual__c, // 涓爣缁忛攢鍟嗭紙鎵嬪姩锛� PCLLostBrand__r.Lost_cancel_report__r.LostType__c, // 澶卞崟绫诲瀷 PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c, // 澶卞崟鎬婚噾棰� + PCLLostBrand__r.Lost_cancel_report__r.TotalAmountLost__c, // 澶卞崟鎬婚噾棰濓紙涓嶅惈绋庯級 //20230215 lt DB202302247719 PCLLostBrand__r.Lost_cancel_report__r.of_lost_system_processor__c, // 澶卞崟涓绘満鍙版暟 PCLLostBrand__r.Lost_cancel_report__r.Opportunity__c from @@ -187,7 +188,8 @@ } // 璧嬪�� opp.LostTypeText__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostType__c; // 澶卞崟绫诲瀷 - opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c; // 澶卞崟閲戦 + //opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.LostTotalAmount__c; // 澶卞崟閲戦 //20230215 lt DB202302247719 娉ㄩ噴 + opp.LostPrices__c = lost.PCLLostBrand__r.Lost_cancel_report__r.TotalAmountLost__c; // 澶卞崟閲戦 //20230215 lt DB202302247719 opp.Lost_reason_main__c = lost.PCLLostBrand__r.Lost_reason_main__c; // 澶卞崟鍘熷洜锛堜富锛� opp.Lost_Reason_Sub__c = lost.PCLLostBrand__r.Lost_Reason_Sub__c; // 澶卞崟鐞嗙敱锛堟锛� opp.of_lost_system_processor__c += lost.Quantity__c; // 澶卞崟涓绘満鍙版暟锛堢疮鍔狅級 @@ -226,11 +228,15 @@ // 鍒濆鍖栧弬鏁� String plus = ''; // 鍒ゆ柇 - if ('鍏朵粬'.equals(lost_brand) && String.isNotBlank(lost_brand_mannual)) { - plus = lost_brand_mannual; - } else { - plus = lost_brand; - } + // SWAG-CCC6F6 2022-04-22 ssm start + // 璇环涓婇兘鍙樉绀洪�夐」鍒楄〃鐨勫�硷紝涓嶉渶瑕佹墜鍔ㄧ殑鍊� + // if ('鍏朵粬'.equals(lost_brand) && String.isNotBlank(lost_brand_mannual)) { + // plus = lost_brand_mannual; + // } else { + // plus = lost_brand; + // } + plus = lost_brand; + // SWAG-CCC6F6 2022-04-22 ssm end // 鍒濆鍖栬繑鍥炲�� if (String.isBlank(lost_brand_in_opp)) { lost_brand_in_opp = ''; @@ -251,11 +257,15 @@ // 鍒濆鍖栧弬鏁� String plus = ''; // 鍒ゆ柇 - if ('瀵规墜缁忛攢鍟�'.equals(lost_agency) && String.isNotBlank(lost_agency_mannual)) { - plus = lost_agency_mannual; - } else { - plus = lost_agency; - } + // SWAG-CCC6F6 2022-04-22 ssm start + // 璇环涓婇兘鍙樉绀洪�夐」鍒楄〃鐨勫�硷紝涓嶉渶瑕佹墜鍔ㄧ殑鍊� + // if ('瀵规墜缁忛攢鍟�'.equals(lost_agency) && String.isNotBlank(lost_agency_mannual)) { + // plus = lost_agency_mannual; + // } else { + // plus = lost_agency; + // } + plus = lost_agency; + // SWAG-CCC6F6 2022-04-22 ssm end // 鍒濆鍖栬繑鍥炲�� if (String.isBlank(lost_agency_in_opp)) { lost_agency_in_opp = ''; -- Gitblit v1.9.1