From 41a627eaaf29658a401ac43e4da838a5b622f44e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期一, 29 五月 2023 16:54:34 +0800
Subject: [PATCH] DB202303088261
---
force-app/main/default/classes/searchContractController.cls | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/searchContractController.cls b/force-app/main/default/classes/searchContractController.cls
index ffc617c..cdc0713 100644
--- a/force-app/main/default/classes/searchContractController.cls
+++ b/force-app/main/default/classes/searchContractController.cls
@@ -4,41 +4,55 @@
public String searchName {get;set;} // 妞滅储鏂囧瓧鍒�
private String ctype;
Date todayDate = Date.today();
+
+ private Boolean OSHFLG;//lt 20230517 瀹夊窘涓ょエ鍒� add
+
public searchContractController() {
ctype = ApexPages.currentPage().getParameters().get('Ctype');
todayDate = Date.today();
}
public void init(){
- User useracc = [SELECT accountid FROM user WHERE id = :UserInfo.getUserId() ];
+ //lt 20230517 瀹夊窘涓ょエ鍒� add ,OSHFLG__c
+ User useracc = [SELECT accountid,OSHFLG__c FROM user WHERE id = :UserInfo.getUserId() ];
+ OSHFLG = Useracc.OSHFLG__c; //lt 20230517 瀹夊窘涓ょエ鍒� add
+
accountid = Useracc.accountid;
at = [SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,
Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c
+ // ,OSH_Dealer__c //20230323 lt DB202303088261 涓ょエ鍒� add
FROM Account
WHERE ParentId = :accountid
- AND Contact_Type__c like :ctype
+ AND Contact_Type__c like :ctype
AND Contract_Decide_Start_Date__c <= :Date.Today()
AND Contract_Decide_End_Date__c >= :Date.Today()
- AND Secondary_contract__c = false];
+ AND Secondary_contract__c = false
+ AND OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
+ // System.debug('lt123---1---'+at);
}
public PageReference serContact(){
at = Database.query(this.makeSoql(searchName,todayDate));
+ // System.debug('lt123---2---'+at);
return null;
}
private String makeSoql(String CateName,Date timetest){
String soql = 'SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,';
- soql += ' Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c FROM Account';
+ soql += ' Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c,OSH_Dealer__c FROM Account'; //20230323 lt DB202303088261 涓ょエ鍒� add ,OSH_Dealer__c
soql += ' where ParentId = \'' + this.accountid + '\'' ;
+ soql += ' AND OSH_Dealer__c = ' + this.OSHFLG + '' ; //lt 20230517 瀹夊窘涓ょエ鍒� add
soql += ' AND Secondary_contract__c = false' ;
- soql += ' AND Contact_Type__c like \'%' + String.escapeSingleQuotes(ctype.replaceAll('%', '\\%')) + '%\'';
+ soql += ' AND Contact_Type__c like \'%' + String.escapeSingleQuotes(ctype.replaceAll('%', '\\%')) + '%\'';
soql += ' AND Contract_Decide_Start_Date__c <=' + String.valueOf(timetest).substring(0, 10);
soql += ' AND Contract_Decide_End_Date__c >= ' + String.valueOf(timetest).substring(0, 10);
if(!String.isBlank(CateName)){
soql += ' AND Name like \'%' + String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) + '%\'';
}
+ // System.debug('lt123---3---'+soql);
return soql;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1