From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/classes/OpportunityPCLController2.cls |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/classes/OpportunityPCLController2.cls b/force-app/main/default/classes/OpportunityPCLController2.cls
index 4da1f97..aed7c5b 100644
--- a/force-app/main/default/classes/OpportunityPCLController2.cls
+++ b/force-app/main/default/classes/OpportunityPCLController2.cls
@@ -163,6 +163,9 @@
 	  textOpts.add(new SelectOption('S:Owner.Province__c','鐪�'));
 	  textOpts.add(new SelectOption('S:Owner.Group__c','缁�'));
 	  textOpts.add(new SelectOption('S:StageName__c','鐘舵��1'));
+	  //DB202211286315 銆愬懆浼�-璇环绠$悊琛ㄣ�戠瓫閫夐」澧炲姞鈥滅姸鎬�2鈥�  xxf 20221115 start
+	  textOpts.add(new SelectOption('S:Status_Formula__c','鐘舵��2'));
+	  //DB202211286315 銆愬懆浼�-璇环绠$悊琛ㄣ�戠瓫閫夐」澧炲姞鈥滅姸鎬�2鈥�  xxf 20221115 end
 	  textOpts.add(new SelectOption('S:Owner.Name','鎷呭綋浜�'));
 	  textOpts.add(new SelectOption('S:OCM__c','OCSM鍒嗙被'));
 	  textOpts.add(new SelectOption('S:Department_Name__c','绉戝鍚�'));
@@ -175,6 +178,9 @@
 	  textOpts.add(new SelectOption('S:Competitor__c','璇环绛夌骇'));
 	  //textOpts.add(new SelectOption('S:OPD_SIS_collect_evaluation_sight__r.Name',Schema.SObjectType.Opportunity.fields.OPD_SIS_collect_evaluation_sight__c.label));
 	  textOpts.add(new SelectOption('S:Forecast_this_month__c','鏈湀棰勬祴'));
+	  //DB202211121149 銆愬懆浼�-璇环绠$悊銆戝懆浼氳浠疯〃鎶娾�滆祫閲戞潵婧愨�濇坊鍔犲埌鈥滄暟鎹瓧娈碘�濅腑杩涜绛涢��  xxf 20221109 start
+	  textOpts.add(new SelectOption('S:Fund_Basis__c','璧勯噾鏉ユ簮'));
+	  //DB202211121149 銆愬懆浼�-璇环绠$悊銆戝懆浼氳浠疯〃鎶娾�滆祫閲戞潵婧愨�濇坊鍔犲埌鈥滄暟鎹瓧娈碘�濅腑杩涜绛涢��  xxf 20221109 end
 	  //杩涘彛璁鸿瘉 fy start
 	  textOpts.add(new SelectOption('t:if_NeedImportDemonstration__c','闇�瑕佽繘鍙h璇�'));
 	  //杩涘彛璁鸿瘉 fy end
@@ -837,6 +843,28 @@
 	private String makeTextSqlStr(String txt1, String con, String val) {
 	  String soql = '';
 	  if (!String.isBlank(txt1)) {
+//DB202211121149 銆愬懆浼�-璇环绠$悊銆戝懆浼氳浠疯〃鎶娾�滆祫閲戞潵婧愨�濇坊鍔犲埌鈥滄暟鎹瓧娈碘�濅腑杩涜绛涢��  xxf 20221109 start
+	  	if (txt1 == 'S:Fund_Basis__c') {
+	  		if(val == '鍖婚櫌璧勯噾'){
+	  		val = val.replaceAll('鍖婚櫌璧勯噾', '鐥呴櫌璩囬噾');
+	  		}
+	  		if(val == '鏀垮簻鎷ㄦ'){
+	  		val = val.replaceAll('鏀垮簻鎷ㄦ', '鏀垮簻璩囬噾');
+	  		}
+	  		if(val == '鍥介檯璧勯噾'){
+	  		val = val.replaceAll('鍥介檯璧勯噾', '鍥介殯璩囬噾');
+	  		}
+	  		if(val == '閾惰璧勯噾'){
+	  		val = val.replaceAll('閾惰璧勯噾', '閵�琛岃硣閲�');
+	  		}
+	  		if(val == '鍏徃/涓汉鎶曡祫'){
+	  		val = val.replaceAll('鍏徃/涓汉鎶曡祫', '浼氱ぞ/鍊嬩汉璩囬噾');
+	  		}
+	  		if(val == '铻嶈祫绉熻祦'){
+	  		val = val.replaceAll('铻嶈祫绉熻祦', '铻嶈祫绉熻祦锛堛儶銉笺偣锛�');
+	  		}
+	  	}
+//DB202211121149 銆愬懆浼�-璇环绠$悊銆戝懆浼氳浠疯〃鎶娾�滆祫閲戞潵婧愨�濇坊鍔犲埌鈥滄暟鎹瓧娈碘�濅腑杩涜绛涢��  xxf 20221109 end
 	  String txt = txt1.substring(2);
 	  String colType = txt1.substring(0, 2);
 	  String tmpVal = val;

--
Gitblit v1.9.1