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/SearchProductController.cls | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/SearchProductController.cls b/force-app/main/default/classes/SearchProductController.cls
index 09d65d9..bc76d66 100644
--- a/force-app/main/default/classes/SearchProductController.cls
+++ b/force-app/main/default/classes/SearchProductController.cls
@@ -12,6 +12,7 @@
public String trade {get;set;} // hidden闋呯洰銇嬨倝銈傘倝銇ｃ仧 CNY 銇� USD 銇枃瀛楀垪
public String lineNo {get;set;} // 瑕敾闈€伄閬告姙銇椼仧琛�
public String val {get;set;} // 瑕敾闈€伄銇嬨倝銇绱㈡枃瀛楀垪
+ public String celon {get;set;} // 瑕敾闈€伄銇嬨倝銇绱㈡枃瀛楀垪 Celon璇环澧炲姞 2022-04-24 ssm
public String SearchName {get;set;} // 妞滅储鏂囧瓧鍒�
@@ -22,6 +23,7 @@
// this.trade = Apexpages.currentPage().getParameters().get('trade');
this.lineNo = Apexpages.currentPage().getParameters().get('lineno');
this.val = Apexpages.currentPage().getParameters().get('val');
+ this.celon = Apexpages.currentPage().getParameters().get('celon');
if (val!=null && val!=''){
SearchName = val;
@@ -50,7 +52,9 @@
//澧炲姞浜у搧涓嶅彲鍙栨秷澶氬勾淇濋�昏緫 绮剧悽鎶�鏈� wql 2020/09/02 end 闃胯タ璧涘 2020/12/29 end
+ ' , Product2.GuranteeType__c , product2.VenderName__c , product2.Maintenance_Price_Year__c '
// 澶氬勾淇濅慨 end
-
+ // 20221020 ljh SWAG-CJ98AJ start
+ + ' , Product2.suitDepartment__c '
+ // 20221020 ljh SWAG-CJ98AJ end
//SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add start
+ ' , Product2.Estimated_ConsumptionDueDate__c '
//SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add end
@@ -95,6 +99,11 @@
system.debug(' trade = '+ trade);
}
+ // Celon璇环淇敼 2022-04-24 ssm start
+ celon = String.isNotBlank(celon) ? celon : null;
+ whereSql += ' and Product2.Celon_Product__c = :celon ';
+ // Celon璇环淇敼 2022-04-24 ssm end
+
searchSql = searchSql + whereStr + whereSql;
//20211123 lt update 450 鍘�500
--
Gitblit v1.9.1