From f24a5026dbfb2981e234ce46ed503584c03ce420 Mon Sep 17 00:00:00 2001 From: 涂煌豪 <tuhuanghao@prec-tech.com> Date: 星期一, 18 四月 2022 17:49:35 +0800 Subject: [PATCH] SelectAssetEstimateVMController --- force-app/main/default/classes/SelectAssetEstimateVMController.cls | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 16 deletions(-) diff --git a/force-app/main/default/classes/SelectAssetEstimateVMController.cls b/force-app/main/default/classes/SelectAssetEstimateVMController.cls index 9a02fd2..78fc108 100644 --- a/force-app/main/default/classes/SelectAssetEstimateVMController.cls +++ b/force-app/main/default/classes/SelectAssetEstimateVMController.cls @@ -44,7 +44,7 @@ //HWAG-B399Q8 2018/08/20 妫�楠屾槸鍚︽樉绀�'璇锋彁浜ゅ緟瀹℃壒' start public Boolean IS_Clone_After_Decide { get; set; } //HWAG-B399Q8 2018/08/20 妫�楠屾槸鍚︽樉绀�'璇锋彁浜ゅ緟瀹℃壒' end - + public List<String> TopProductModel =new List<String>(); static { recordNum = new List<SelectOption>(); recordNum.add(new SelectOption('10', '10')); @@ -240,8 +240,11 @@ + 'Asset_Owner__c, Accumulation_Repair_Amount__c, Maintenance_Price_Month__c, Final_Examination_Date__c, ' + 'CurrentContract_F__c,CurrentContract_F__r.Maintenance_Contract_No_F__c,CurrentContract_F__r.Management_Code__c,CurrentContract_F__r.RecordType_DeveloperName__c,CurrentContract_F__r.Estimate_Num__c,CurrentContract_F__r.Contract_End_Date__c,' + 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c, ' - + 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,' + + 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c, ' + 'CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,CurrentContract_F__r.Contract_Range__c,' + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + +'CurrentContract_F__r.Open_RenewalQuotation__c,' + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end + 'CurrentContract_End_Date__c, Extend_Gurantee_DateTo__c,EquipmentGuaranteeFlg__c,AssetMark__c,NoPartRiskDate_F__c,NoPartRiskDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' '; //HWAG-BDJ43R ---XHL---20190729--- //soql += ' AND AssetMark__c != \'鑰楁潗\' AND Product2.Family != \'ET\' '; @@ -705,6 +708,9 @@ CurrentContract_F__r.First_Estimate_Date__c, CurrentContract_F__r.Contract_Consumption_rate__c, CurrentContract_F__r.First_contract_usage_Rate__c, CurrentContract_F__r.Contract_Range__c, AssetMark__c, + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + CurrentContract_F__r.Open_RenewalQuotation__c, + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end // 2021-01-29 LJPH-BX9CVX mzy add 鍚堝悓鎶ヤ环鏃跺垽鏂浂浠堕闄� NoPartRiskDate_F__c, NoPartRiskDate__c, SignableFlag__c, Product2.PartSupplyFinishDate__c, Product2.PartSupplyFinishDateExp__c @@ -745,7 +751,10 @@ Asset__r.CurrentContract_F__r.Estimate_Contract_endDate__c, Asset__r.CurrentContract_F__r.Contract_Range__c, Asset__r.CurrentContract_F__r.Contract_End_Date__c, - Asset__r.CurrentContract_F__r.Gurantee_Estimate_startDate__c + Asset__r.CurrentContract_F__r.Gurantee_Estimate_startDate__c, + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + Asset__r.CurrentContract_F__r.Open_RenewalQuotation__c + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end from Maintenance_Contract_Asset__c where Maintenance_Contract__c = :this.targetMaintenanceContractId ]; @@ -810,6 +819,9 @@ Asset__r.CurrentContract_F__r.Contract_Range__c, Asset__r.CurrentContract_F__r.Contract_End_Date__c, Asset__r.CurrentContract_F__r.Gurantee_Estimate_startDate__c, + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + Asset__r.CurrentContract_F__r.Open_RenewalQuotation__c, + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end LastMContract_Price__c, Asset__r.CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c, Asset__r.CurrentContract_F_asset__r.endDateGurantee_Text__c, @@ -1022,6 +1034,9 @@ + 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c, ' + 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,' + 'CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,' + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + + 'CurrentContract_F__r.Open_RenewalQuotation__c,' + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end + 'CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\' ' + 'AND Id NOT IN ' + notInId; //HWAG-B4R3SS START 20181026 @@ -1066,6 +1081,9 @@ sqlStr += 'CurrentContract_F_asset__c,CurrentContract_F_asset__r.Estimate_Cost_Month_formula__c,CurrentContract_F_asset__r.endDateGurantee_Text__c,CurrentContract_F__r.Gurantee_Estimate_startDate__c,'; sqlStr += 'CurrentContract_F__r.First_Estimate_Date__c,CurrentContract_F__r.Estimate_Contract_endDate__c,'; sqlStr += 'CurrentContract_F__r.Contract_Consumption_rate__c,CurrentContract_F__r.First_contract_usage_Rate__c,'; + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 start + sqlStr += 'CurrentContract_F__r.Open_RenewalQuotation__c,'; + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220414 end sqlStr += ' CurrentContract_F__r.Contract_Range__c,AssetMark__c,NoPartRiskDate__c,NoPartRiskDate_F__c,Product2.PartSupplyFinishDate__c,SignableFlag__c FROM Asset WHERE Hospital__c = \'' + this.targetHospitalId + '\''; //JZHG-BSDUT4 ---20200825---update By rentongxiao---Start // sqlStr += ' AND ( AssetMark__c != \'鑰楁潗\' OR Product2.Family != \'ET\' ) '; @@ -2406,16 +2424,16 @@ t = this.estimate.Contract_Start_Date__c.addMonths(Integer.valueOf(this.estimate.Contract_Range__c)); t = t.addDays(-1); this.estimate.Contract_End_Date__c = t; - //浠ユ彁浜ゆ姤浠风殑鏃剁偣锛岄攣瀹氱粡閿�鍟嗙殑鍏堟鐘舵�侊紝decide鏃朵笉鍐嶆洿鏂扮粡閿�鍟嗙殑鎬ц川 thh 20220407 start - //add wangweipeng 2021/12/26 start - // if(String.isNotBlank(this.estimate.Dealer__c)){ - // checkDealerId = this.estimate.Dealer__c; - // onChDealerUpdate(); - // }else{ - // this.estimate.Is_RecognitionModel__c = false; - // } - //add wangweipeng 2021/12/26 end - //浠ユ彁浜ゆ姤浠风殑鏃剁偣锛岄攣瀹氱粡閿�鍟嗙殑鍏堟鐘舵�侊紝decide鏃朵笉鍐嶆洿鏂扮粡閿�鍟嗙殑鎬ц川 thh 20220407 end + //鎻愪氦涔嬪悗decide涔嬪墠锛岀粡閿�鍟嗗彉鏇寸殑璇濓紝鍏堟淇℃伅浠ュ彉鏇村悗鐨勭粡閿�鍟嗗厛娆句俊鎭墽琛� thh 20220418 start + // add wangweipeng 2021/12/26 start + if(String.isNotBlank(this.estimate.Dealer__c)){ + checkDealerId = this.estimate.Dealer__c; + onChDealerUpdate(); + }else{ + this.estimate.Is_RecognitionModel__c = false; + } + // add wangweipeng 2021/12/26 end + //鎻愪氦涔嬪悗decide涔嬪墠锛岀粡閿�鍟嗗彉鏇寸殑璇濓紝鍏堟淇℃伅浠ュ彉鏇村悗鐨勭粡閿�鍟嗗厛娆句俊鎭墽琛� thh 20220418 end System.debug('---------345----'+this.estimate.Dealer__c+'-------'+this.estimate.Dealer__r.FirstParagraphEnd__c); // 浣嶇疆璋冩暣 鍦�1951 line // Date createdDate = this.estimate.CreatedDate == null ? System.today() : this.estimate.CreatedDate.date(); @@ -2899,8 +2917,10 @@ //1.鍚堝悓鏈熶笉婊′竴骞存椂锛屽悎鍚屾湡瓒呰繃涓�鍗婃墠鍙紑濮嬬画绛炬姤浠枫��(eg:11涓湀鐨勫悎鍚屼粠6涓湀鍚庢墠鍙姤浠枫��) //2.涓�骞翠互涓婄殑鍚堝悓锛屽湪缁撴潫鍓�6涓湀寮�濮嬪彲浠ュ紑鏀剧画绛炬姤浠枫�� //3.绠$悊鍛樿烦杩囷紝 - if (UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') { - + //WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220413 + if (input.rec.CurrentContract_F__r.Open_RenewalQuotation__c == false && UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && + String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c != 'VM_Contract') { + Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F__r.Contract_End_Date__c); Decimal monthCon = (Decimal)noOfDays / 365 * 12; // 鍙紑濮嬫姤浠风殑鏈堟暟闄愬埗 @@ -2916,7 +2936,7 @@ } } // 澶氬勾淇濆垽鏂� - if ( String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') { + if (String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') { //if (UserInfo.getProfileId() != System.Label.ProfileId_SystemAdmin && String.isNotBlank(input.rec.CurrentContract_F__c) && input.rec.CurrentContract_F__r.RecordType_DeveloperName__c == 'VM_Contract') { //Integer noOfDays = today.daysBetween(input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c); -- Gitblit v1.9.1