From 41ad0c0840a6135b7acf2280f0eebdc29bf6479b Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 30 五月 2023 14:25:11 +0800
Subject: [PATCH] backup0530
---
force-app/main/default/classes/LexSearchContractController.cls | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/LexSearchContractController.cls b/force-app/main/default/classes/LexSearchContractController.cls
index a3352d4..1cf641e 100644
--- a/force-app/main/default/classes/LexSearchContractController.cls
+++ b/force-app/main/default/classes/LexSearchContractController.cls
@@ -1,9 +1,13 @@
public without sharing class LexSearchContractController {
+ private static Boolean OSHFLG;//lt 20230517 瀹夊窘涓ょエ鍒� add
+
@AuraEnabled
public static Results init(String ctype){
Results results = new Results();
try {
- 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;
String accountId = Useracc.accountid;
List<Account> attList = [SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,
Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c
@@ -12,7 +16,9 @@
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
+ ];
results.attList = attList;
results.result = 'Success';
} catch (Exception e) {
@@ -23,8 +29,9 @@
}
@AuraEnabled
- public static Results searchContract(String searchName, String accountId, String ctype){
+ public static Results searchContract(String searchName, String accountId, String ctype, Boolean OSHFLGStr){
Results results = new Results();
+ OSHFLG = OSHFLGStr;
try {
results.attList = Database.query(makeSoql(searchName,Date.today(),accountId,ctype));
results.result = 'Success';
@@ -38,8 +45,9 @@
private static String makeSoql(String CateName,Date timetest,String accountId, String ctype){
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';
soql += ' where ParentId = \'' + accountId + '\'' ;
+ soql += ' AND OSH_Dealer__c = ' + OSHFLG + '' ; //lt 20230517 瀹夊窘涓ょエ鍒� add
soql += ' AND Secondary_contract__c = false' ;
soql += ' AND Contact_Type__c like \'%' + String.escapeSingleQuotes(ctype.replaceAll('%', '\\%')) + '%\'';
soql += ' AND Contract_Decide_Start_Date__c <=' + String.valueOf(timetest).substring(0, 10);
--
Gitblit v1.9.1