From 8428edb9920a6a082c88cad454b0dc636297e775 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 18:43:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/LeadIntentionController.cls | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/classes/LeadIntentionController.cls b/force-app/main/default/classes/LeadIntentionController.cls
index ec71404..32c13a3 100644
--- a/force-app/main/default/classes/LeadIntentionController.cls
+++ b/force-app/main/default/classes/LeadIntentionController.cls
@@ -1,5 +1,5 @@
public without sharing class LeadIntentionController {
- public List<PCLInfo> pclInfos { get; set; }
+ public List<PCLInfo> pclInfos { get; set; }
/*****************妞滅储鐢�******************/
@@ -64,7 +64,7 @@
public String[] sortOrder { get; set; }
public String[] columus = new String[]{'Contact_Name__c', 'Hospital_Name__c', 'Department_Class__c', 'Company__c', 'Status__c'
,'Request1__c', 'Inquiry_No__c', 'Phone__c', 'Email__c', 'Cancel_Reason__c'
- ,'Opp_Name_Search__c', 'Opportunity_Division__c', 'LeadSource__c', 'Campaign__c'
+ ,'Opp_Name_Search__c', 'Opportunity_Division__c', 'LeadSource__c', 'Campaign__c'
,'Urgent__c', 'Request_Detail__c','Contact_Id__c','Hospital_ID__c','Department_ID__c','Opp_Name_Search_ID__c'
,'Campaign_ID__c','Id','Name','Family_Name__c','Last_Name__c','Reasons_options__c','Product1__c'
};
@@ -156,11 +156,11 @@
}
soqlWithoutSort = this.makeSoql(false, accSearch, ownerSearch,
text, condition, value, text2, condition2, value2, text3, condition3, value3);
- String soql = soqlWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(limits);
+ String soql = soqlWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(limits);
soqlForMoneyWithoutSort = this.makeSoql(true, accSearch, ownerSearch,
text, condition, value, text2, condition2, value2, text3, condition3, value3);
- String soqlForMoney = soqlForMoneyWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(System.Label.TotalLimit);
+ String soqlForMoney = soqlForMoneyWithoutSort + ' order by CreatedDate desc limit ' + Integer.valueOf(System.Label.TotalLimit);
System.debug('soqlWithoutSort:' + soqlWithoutSort);
system.debug('aaaaaaaaaa'+soql);
system.debug('bbbbbbb:'+soqlForMoney);
@@ -258,7 +258,7 @@
List<Inquiry_form__c> updateInquiryform = new List<Inquiry_form__c>();
Inquiry_form__c inquiryForm = new Inquiry_form__c();
inquiryForm.Id = inquiryformId;
- inquiryForm.Status__c = '涓嶉渶瑕�';
+ inquiryForm.Status__c = '02.涓嶉渶瑕�';
//涓嶉渶瑕佺殑鏃跺�� 鐨勭‘璁ゆ棩鏈�
system.debug('ccccccc:'+opp_ID);
inquiryForm.Confirmation_Date__c = Date.toDay();
@@ -296,7 +296,7 @@
system.debug('杈撳嚭鐨勫�间负锛�'+oi.reasonFlg);
if (oi.reasonFlg == '1') {
oi.reasonFlg = '0';
- oi.rec.Status__c = '涓嶉渶瑕�';
+ oi.rec.Status__c = '02.涓嶉渶瑕�';
oi.rec.Reasons_options__c=batchReason;
oi.rec.Cancel_Reason__c = batchReason;
oi.rec.Confirmation_Date__c = Date.toDay();
--
Gitblit v1.9.1