From 0f44cb1a0b7b36860e9ce81c1eac9e395d87f0b4 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 13:53:18 +0800
Subject: [PATCH] mergecode into lex dtt
---
force-app/main/default/classes/SelectAssetEstimateVMController.cls | 107 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/SelectAssetEstimateVMController.cls b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
index bff4d41..a98e211 100644
--- a/force-app/main/default/classes/SelectAssetEstimateVMController.cls
+++ b/force-app/main/default/classes/SelectAssetEstimateVMController.cls
@@ -18,6 +18,11 @@
public Boolean printAgent { get; private set; }
public boolean inDicideFlag {get; set;} //浣滀负琛ュ厖锛屽搴旀姤浠峰喅瀹氫箣鍚庯紝鍗存湭鑳借鍚堝悓璧锋鏃ユ湡浼犻�掔粰鍚堝悓鐨勯棶棰�
public String isPaymentSet {get; set;}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // public Boolean Is_Blank_period {get; set;}
+ // public String Cost_rate_ForecastF{get;set;}
+ // public String PastContractendday{get;set;}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
//public String PaymentSet {get;set;}
// 寮曟暟銇偟銉笺儞銈瑰绱勩伄鎯呭牨銈掓牸绱嶃仚銈嬨��
public Maintenance_Contract__c contract { get; private set; }
@@ -827,7 +832,10 @@
, Maintenance_Contract__r.Open_RenewalQuotation__c,Maintenance_Contract__r.VM_Contract_Check__c
//WLIG-CDFBV3 寮�閫氱画绛炬姤浠蜂负true鐨勫彲浠ュ紑鏀剧画绛炬姤浠� thh 20220419 end'
//LJPH-C9SCX7 銆愬鎵樸�戝悎鍚屾棤绌虹櫧鏈熺殑鎻愰啋 lt 20211221 start
- //, Maintenance_Contract__r.Past_Contract_end_day__c //杩囧幓鍚堝悓缁撴潫鏃�
+ // 鎶ヤ环瑙勫垯鏀瑰杽20230314 start
+ // , Maintenance_Contract__r.Past_Contract_end_day__c //杩囧幓鍚堝悓缁撴潫鏃�
+ // ,renewTen_OFF__c
+ // 鎶ヤ环瑙勫垯鏀瑰杽20230314 end
//LJPH-C9SCX7 銆愬鎵樸�戝悎鍚屾棤绌虹櫧鏈熺殑鎻愰啋 lt 20211221 end
// URF闄愭鍚堝悓2鏈� LY 20220811 start
,URF_P_MaxRepairCount__c,URF_V_MaxRepairCount__c
@@ -1030,7 +1038,9 @@
, URF_Maintenance_Contract__r.Management_Code__c
, URF_Maintenance_Contract__r.Contract_End_Date__c
//URF闄愭鍚堝悓2鏈� LY 20220811 end
-
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 start
+ // ,IS_StandardPricing__c
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230315 end
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 start
,CurrentContract_F_asset__r.Asset_Consumption_Rate__c
,CurrentContract_F_asset__r.Maintenance_Price_Year__c
@@ -1038,6 +1048,8 @@
,Product2.Asset_Model_No__c
,Product2.Category4__c
,CurrentContract_F__r.endDateGurantee__c
+ //娣诲姞鏄惁鏈嶅姟澶氬勾淇濅慨锛屽骞翠繚缁翠慨鏈熻嚦
+ ,IS_Extend_Gurantee__c,Extend_Gurantee_DateTo__c
//澶氬勾淇濊澶囩画绛捐绠楅�昏緫璋冩暣 2023/1/17 end
FROM Asset WHERE Hospital__c = :this.targetHospitalId AND ( AssetMark__c != '鑰楁潗' OR Product2.Family != 'ET' ) ORDER BY ID, IF_Warranty_Service__c asc];
//JZHG-BSDUT4 ---20200825---update By rentongxiao---Start
@@ -1063,7 +1075,17 @@
}else{
this.isLimitPrice = false;
}
- // 涓婇檺鍚堝悓 hql 20230216 start
+ // 涓婇檺鍚堝悓 hql 20230216 end
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // Maintenance_Contract__c mc1 = [SELECT id,Is_Blank_period__c,Cost_rate_ForecastF__c FROM Maintenance_Contract__c WHERE Id =: this.targetMaintenanceContractId];
+ // Boolean IsBlankperiod = mc1.Is_Blank_period__c;
+ // this.Cost_rate_ForecastF = mc1.Cost_rate_ForecastF__c;
+ // if(IsBlankperiod){
+ // this.Is_Blank_period = true;
+ // }else{
+ // this.Is_Blank_period = false;
+ // }
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
// 閬告姙娓堛伩銇磵鍏ユ鍣ㄦ儏鍫便倰鍙栧緱
Map<Id, Integer> selectedAssetIds = new Map<Id, Integer>();
List<Maintenance_Contract_Asset_Estimate__c> selectedMcaes = new List<Maintenance_Contract_Asset_Estimate__c>();
@@ -1252,7 +1274,7 @@
Adjustment_Lower_price__c,
Adjustment_Upper_price__c,
// 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 start
- IS_StandardPricing__c,
+ // IS_StandardPricing__c,
// 鏈嶅姟鍚堝悓鎶ヤ环瑙勫垯鏀瑰杽 20230227 end
Last_inspection_day__c,
Check_Result__c,
@@ -1262,6 +1284,9 @@
Repair_Price_Auto__c,
Third_Party_Return__c,
// (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� end
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // Blank_period__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
Comment__c,
Asset__r.Posting_Date__c,
EquipmentGuaranteeFlgTxt__c,
@@ -1328,6 +1353,7 @@
// Map<String,repair__c> assNewRepMap = new Map<String,repair__c>();
// assNewRepMap = getNewrep(this.assetRecords);
datatemp = getChartData();
+ System.debug(LoggingLevel.INFO, '*** this.assetRecords: ' + this.assetRecords);
for (Asset ast : this.assetRecords) {
Boolean isNew = false;
Decimal listPrice = ast.Maintenance_Price_Month__c;
@@ -1384,7 +1410,9 @@
//
//
//
+ ast.CurrentContract_End_Date__c = ast.CurrentContract_F_asset__r.IS_VMContract_Asset__c ? ast.Extend_Gurantee_DateTo__c : ast.CurrentContract_End_Date__c;
checkedAssets.add(new AssetInfo(checkedAssets.size(), ast, isNew, listPrice, selectedLocal,estimate));
+
} else {
//update by rentongxiao 2020-09-23 start
if (ast.AssetMark__c == '涓绘満') {
@@ -1405,6 +1433,8 @@
}
*/
}
+
+ System.debug(LoggingLevel.INFO, '*** checkedAssets: ' + checkedAssets);
totalPage = (totalRecords / selctRecordNum) + (Math.mod(totalRecords, selctRecordNum) > 0 ? 1 : 0);
system.debug('椤哄簭妫�娴�' + checkedAssets);
@@ -1431,7 +1461,7 @@
//2021-11-30 fy add LJPH-C8W8FV 缃《 start
List<AssetInfo> topAsset =new List<AssetInfo>();
List<AssetInfo> otherAsset =new List<AssetInfo>();
-
+ System.debug(LoggingLevel.INFO, '*** 椤哄簭: ' + checkedAssets);
for(AssetInfo ched : checkedAssets){
system.debug('椤哄簭妫�娴�2' + ched.ProductModelNoc);
system.debug('椤哄簭妫�娴�3' + ched.AssetModelNoc);
@@ -1456,6 +1486,7 @@
}
checkedAssets=NumberSort;
//2021-11-30 fy add LJPH-C8W8FV 缃《 end
+ System.debug(LoggingLevel.INFO, '*** checkedAssetsEND: ' + checkedAssets);
}
//
@@ -1777,6 +1808,9 @@
and Agreed_Date__c != null
and Agreed_Date__c > :LastYearDate
and Agreed_Date__c <= :today
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
List<AggregateResult> SecRepairList = [
@@ -1801,6 +1835,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastYearDate
and Agreed_Date__c > :LastSecondYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞撮棿淇悊瀹炵哗
@@ -1826,6 +1863,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastSecondYearDate
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞翠慨鐞嗗疄缁�
@@ -1851,6 +1891,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :today
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
@@ -1992,6 +2035,9 @@
and Agreed_Date__c != null
and Agreed_Date__c > :LastYearDate
and Agreed_Date__c <= :today
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
List<AggregateResult> SecRepairList = [
@@ -2016,6 +2062,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastYearDate
and Agreed_Date__c > :LastSecondYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞撮棿淇悊瀹炵哗
@@ -2041,6 +2090,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :LastSecondYearDate
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓3骞翠慨鐞嗗疄缁�
@@ -2066,6 +2118,9 @@
and Agreed_Date__c != null
and Agreed_Date__c <= :today
and Agreed_Date__c > :LastThirdYearDate
+ // DB202302544421 LHJ add
+ and Status2__c !='00.鍒犻櫎'
+ and Status2__c !='00.鍙栨秷'
group by Delivered_Product__c
];
// 杩囧幓1骞撮棿
@@ -3523,6 +3578,9 @@
if (newValue.size() > 0) insert newValue;
}
// 鈶� start
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 start
+ // this.contract.Is_Blank_period__c = this.Is_Blank_period;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230309 end
this.contract.Estimation_Id__c = this.targetEstimateId;
this.contract.Contract_Esti_Start_Date__c = this.estimate.Contract_Esti_Start_Date__c;
this.contract.Contract_Range__c = this.estimate.Contract_Range__c;
@@ -3924,15 +3982,17 @@
Decimal monthCon = (Decimal)noOfDays/365*12;
- //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 Start 缁撴潫鏃ョ┖鐧芥湡澶т簬6涓湀 鎶ラ敊鎻愮ず
+ //甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 Start 缁撴潫鏃ョ┖鐧芥湡澶т簬6涓湀 鎶ラ敊鎻愮ず 鏂扮殑鍚堝悓鎶ヤ环寮�濮嬫棩鏈熷拰涓婁竴鏈熷悎鍚�
Date endDate6Month = input.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c.addMonths(6);
Date cotractEndDay = input.rec.CurrentContract_F__r.endDateGurantee__c;
-
-
- if(today>endDate6Month && cotractEndDay <today){
- input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 寤鸿绌虹櫧鏈熸帶鍒跺湪1涓湀浠ュ唴锛屽涓嶅緱宸辩┖鐧芥湡鍦�6涓湀浠ヤ笂锛岃鍏堣仈缁滄湇鍔＄鐞嗛儴璇勪及銆�');
-
+ System.debug(LoggingLevel.INFO, '*** endDate6Month: ' + endDate6Month);
+ System.debug(LoggingLevel.INFO, '*** cotractEndDay: ' + cotractEndDay);
+ System.debug(LoggingLevel.INFO, '*** this.estimate.Contract_Esti_Start_Date__c: ' + this.estimate.Contract_Esti_Start_Date__c);
+ if(this.estimate.Contract_Esti_Start_Date__c >endDate6Month && cotractEndDay < this.estimate.Contract_Esti_Start_Date__c){
+ System.debug(LoggingLevel.INFO, '*** meet error: ' );
+ input.rec.Name.addError(input.rec.Name + '(' + input.rec.SerialNumber + ') -- 甯傚満澶氬勾淇濈粨鏉熷凡瓒呰繃6涓湀锛岀敱浜庣┖鐧芥湡杩囬暱锛岃鍏堣仈绯绘湇鍔＄鐞嗛儴璇勪及銆�');
+ rtn = false;
}
//甯傚満澶氬勾淇濅慨浠锋牸寮�鍙� DC 2023/02/02 end
@@ -4122,6 +4182,7 @@
public Maintenance_Contract_Estimate__c estimate {get; set;}
public Transient Decimal orgPrice {get; private set;}
public Transient Decimal orgPrice12 {get; private set;}
+ public String Blank_period {get; set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� Star
public Boolean CheckRows {get; private set;}
// add by fxk 2021/9/9 鎺у埗鐐规瀵硅薄鏄惁鍙�� End
@@ -4178,9 +4239,16 @@
public AssetInfo(Integer lineNo, Asset record, Boolean isNew, Decimal listPrice, Maintenance_Contract_Asset_Estimate__c mcae,Maintenance_Contract_Estimate__c estimate) {
this.lineNo = lineNo;
this.rec = record;
- this.ISStandardPricing = mcae.IS_StandardPricing__c;
+ this.rec.CurrentContract_End_Date__c = record.CurrentContract_End_Date__c;
+ // this.rec.CurrentContract_End_Date__c = record.IS_Extend_Gurantee__c ? record.Extend_Gurantee_DateTo__c : record.CurrentContract_End_Date__c;
+ // this.ISStandardPricing = record.IS_StandardPricing__c;
this.estimate = new Maintenance_Contract_Estimate__c();
this.estimate.IS_Reduced_price_approval__c = estimate.IS_Reduced_price_approval__c;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // this.estimate.Contract_Esti_Start_Date__c = estimate.Contract_Esti_Start_Date__c;
+ // this.estimate.renewTen_OFF__c = estimate.renewTen_OFF__c;
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
+
// (2022骞�12鏈堜笂绾�)鏁呴殰鍝佸姞璐� start
// if (record.Asset_situation__c == '淇悊涓�' && record.Return_Without_Repair__r.Agreed_Date__c!=null) {
// this.Agreed_Date = '涓嶄负绌�';
@@ -4209,6 +4277,9 @@
Check_Result__c = mcae.Check_Result__c,
Repair_Price__c = mcae.Repair_Price__c,
Repair_Price_pass__c = mcae.Repair_Price_pass__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // Blank_period__c = mcae.Blank_period__c,
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
Comment__c = mcae.Comment__c,
EquipmentGuaranteeFlgTxt__c = mcae.EquipmentGuaranteeFlgTxt__c,
Estimate_Cost__c = mcae.Estimate_Cost__c,
@@ -4232,6 +4303,17 @@
this.mcae.Repair_Price_pass__c = this.mcae.Repair_Price__c;
}
}
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 start
+ // if (this.estimate.Contract_Esti_Start_Date__c!=null && this.rec.CurrentContract_End_Date__c != null) {
+ // this.mcae.Blank_period__c = String.valueof(this.rec.CurrentContract_End_Date__c.daysbetween(this.estimate.Contract_Esti_Start_Date__c));
+ // }
+ // if (this.estimate.Contract_Esti_Start_Date__c==null && this.rec.CurrentContract_End_Date__c != null) {
+ // this.mcae.Blank_period__c = String.valueof(this.rec.CurrentContract_End_Date__c.daysbetween(system.today()));
+ // }
+ // if (this.mcae.Blank_period__c!=null&&integer.valueOf(this.mcae.Blank_period__c)<15 ) {
+ // this.mcae.Blank_period__c = '鏃犵紳缁';
+ // }
+ // 鎶ヤ环瑙勫垯鏀瑰杽 20230308 end
this.isManual = false;
this.rec_checkBox_c = true;
this.orgPrice = record.Maintenance_Price_Month__c;
@@ -4262,7 +4344,6 @@
public AssetInfo(Integer lineNo, Maintenance_Contract_Asset_Estimate__c mcae) {
this.lineNo = lineNo;
this.rec = null;
- this.ISStandardPricing = mcae.IS_StandardPricing__c;
this.mcae = new Maintenance_Contract_Asset_Estimate__c(
// id = mcae.Id, // 鏈綋銇亜銈夈仾銇勩伄锛� 銈汇儍銉堛仐銇熴倝銆佹柊瑕忔ī闄愩亴銇亸銇с倐銆佹洿鏂般仹銇嶃伨銇欍�傚緦钘ゃ仌銈撱伀纰鸿獚銇椼仧銆併仾銇忋仹銈傘亜銇勩仹銇欍��
isNew__c = mcae.IsNew__c,
--
Gitblit v1.9.1