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/NewPaymentPlanLoadController.cls | 73 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/NewPaymentPlanLoadController.cls b/force-app/main/default/classes/NewPaymentPlanLoadController.cls
index 481cd96..d06c9ca 100644
--- a/force-app/main/default/classes/NewPaymentPlanLoadController.cls
+++ b/force-app/main/default/classes/NewPaymentPlanLoadController.cls
@@ -84,7 +84,13 @@
Amount_Warranty_Coverage__c,
Amount_Warranty_Coverage_In_Word__c,
//HWAG-BHT7XX 2019/11/26 END
- Decided_Estimation__c
+ Decided_Estimation__c,
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 star
+ old_Is_RecognitionModel__c
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end
+ //URF闄愭鍚堝悓2鏈� LY 20220811 star
+ ,URF_Contract__c
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
from
Maintenance_Contract__c
where
@@ -98,7 +104,7 @@
PageMCEElement = PageMCE[0];
//HWAG-BHT7XX 2019/11/26 START
- agreeUpperLimit = PageMCE[0].agree_Upper_limit__c ;
+ agreeUpperLimit = PageMCE[0].URF_Contract__c ;
//HWAG-BHT7XX 2019/11/26 END
// fxk 2021/8/31 鐐规娆℃暟蹇呴』閫� Star
// if (PageMCEElement.Inspection_Time__c == null || ''.equals(PageMCEElement.Inspection_Time__c) || '0'.equals(PageMCEElement.Inspection_Time__c)) {
@@ -106,7 +112,10 @@
// }
// fxk 2021/8/31 鐐规娆℃暟蹇呴』閫� end
if (PageMCEElement.Small_Repair_Time__c == null) {
- PageMCEElement.Small_Repair_Time__c = '48';
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
+ //PageMCEElement.Small_Repair_Time__c = '48';
+ PageMCEElement.Small_Repair_Time__c = '7';
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end
}
if (PageMCEElement.Big_Repair_Time__c == null) {
@@ -144,20 +153,40 @@
public List<SelectOption> getSmall_Repair_Time() {
List<SelectOption> options = new List<SelectOption>();
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
+ // options.add(new SelectOption('24', '24'));
+ // options.add(new SelectOption('48', '48'));
+ // options.add(new SelectOption('72', '72'));
+ options.add(new SelectOption('5', '5'));
+ options.add(new SelectOption('7', '7'));
+ options.add(new SelectOption('10', '10'));
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end
+ return options;
+ }
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start
+ public List<SelectOption> getLive_Technical_Support_Time() {
+ List<SelectOption> options = new List<SelectOption>();
options.add(new SelectOption('24', '24'));
options.add(new SelectOption('48', '48'));
options.add(new SelectOption('72', '72'));
-
+
return options;
}
+ //XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end
public List<SelectOption> getTour_Check() {
List<SelectOption> options = new List<SelectOption>();
- options.add(new SelectOption('0', '0'));
- options.add(new SelectOption('1', '1'));
- options.add(new SelectOption('2', '2'));
- options.add(new SelectOption('3', '3'));
- options.add(new SelectOption('4', '4'));
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ if (PageMCEElement.URF_Contract__c ){
+ options.add(new SelectOption('0', '0'));
+ }else {
+ options.add(new SelectOption('0', '0'));
+ options.add(new SelectOption('1', '1'));
+ options.add(new SelectOption('2', '2'));
+ options.add(new SelectOption('3', '3'));
+ options.add(new SelectOption('4', '4'));
+ }
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
// del fxk 2021.9.2 鍒犻櫎澶氫綑鐨勭偣妫�娆℃暟 Star
return options;
}
@@ -176,7 +205,12 @@
public List<SelectOption> getTerm_Of_Payment() {
List<SelectOption> options = new List<SelectOption>();
options.add(new SelectOption('涓�娆℃�т粯娆�', '涓�娆℃�т粯娆�'));
- options.add(new SelectOption('澶氭浠樻', '澶氭浠樻'));
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ //if (!PageMCEElement.old_Is_RecognitionModel__c){
+ if (!PageMCEElement.URF_Contract__c){
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
+ options.add(new SelectOption('澶氭浠樻', '澶氭浠樻'));
+ }
return options;
}
@@ -311,7 +345,10 @@
return null;
}
// gzw fix 楠岃瘉璁剧疆涓哄叏灞�
- if (PageMCEElement.Inspection_Time__c == null || ''.equals(PageMCEElement.Inspection_Time__c) || '0'.equals(PageMCEElement.Inspection_Time__c)) {
+ if ((PageMCEElement.Inspection_Time__c == null || ''.equals(PageMCEElement.Inspection_Time__c) || '0'.equals(PageMCEElement.Inspection_Time__c))
+ //URF闄愭鍚堝悓2鏈� LY 20220811 start
+ && !PageMCEElement.URF_Contract__c) {
+ //URF闄愭鍚堝悓2鏈� LY 20220811 end
System.debug('11111111111' + PageMCEElement.Inspection_Time__c);
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,
// '闈炴爣鍚堝悓涓嶉渶瑕佹墦鍗板悎鍚屾枃鏈紒'));
@@ -404,12 +441,14 @@
if (PageMCEElement.Engineer_Name__c == null || ''.equals(PageMCEElement.Engineer_Name__c)) {
requiredInput += '宸ョ▼甯堝鍚�';
}
- if (PageMCEElement.Phone_Number__c == null || ''.equals(PageMCEElement.Phone_Number__c)) {
- if (!''.equals(requiredInput)) {
- requiredInput += '銆�';
- }
- requiredInput += '鎵嬫満鍙风爜';
- }
+ //URF闄愭鍚堝悓2鏈� LY 20220920 start
+ // if (PageMCEElement.Phone_Number__c == null || ''.equals(PageMCEElement.Phone_Number__c)) {
+ // if (!''.equals(requiredInput)) {
+ // requiredInput += '銆�';
+ // }
+ // requiredInput += '鎵嬫満鍙风爜';
+ // }
+ //URF闄愭鍚堝悓2鏈� LY 20220920 end
if (PageMCEElement.Small_Repair_Time__c == null || ''.equals(PageMCEElement.Small_Repair_Time__c)) {
if (!''.equals(requiredInput)) {
requiredInput += '銆�';
--
Gitblit v1.9.1