From b5c5eb130ca0848124f9d136af4be142ad5aac07 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 14:42:02 +0800
Subject: [PATCH] backup0626
---
force-app/main/default/classes/LexSearchContractController.cls | 49 +++++++++++++++++++++----------------------------
1 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/force-app/main/default/classes/LexSearchContractController.cls b/force-app/main/default/classes/LexSearchContractController.cls
index a7fd48d..1cf641e 100644
--- a/force-app/main/default/classes/LexSearchContractController.cls
+++ b/force-app/main/default/classes/LexSearchContractController.cls
@@ -1,34 +1,26 @@
public without sharing class LexSearchContractController {
- private static Boolean OSHFLG; //lt 20230517 瀹夊窘涓ょエ鍒� add
+ private static Boolean OSHFLG;//lt 20230517 瀹夊窘涓ょエ鍒� add
@AuraEnabled
- public static Results init(String ctype) {
+ public static Results init(String ctype){
Results results = new Results();
try {
//lt 20230517 瀹夊窘涓ょエ鍒� add ,OSHFLG__c
- User useracc = [SELECT accountid, OSHFLG__c FROM user WHERE id = :UserInfo.getUserId()];
+ 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
- FROM Account
- WHERE
- ParentId = :accountId
- AND Contact_Type__c LIKE :ctype
+ 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
+ FROM Account
+ WHERE ParentId = :accountId
+ 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 OSH_Dealer__c = :OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
- ];
+ AND Secondary_contract__c = false
+ AND OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
results.attList = attList;
- results.result = 'Success';
+ results.result = 'Success';
} catch (Exception e) {
results.result = 'Fail';
results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
@@ -37,12 +29,12 @@
}
@AuraEnabled
- public static Results searchContract(String searchName, String accountId, String ctype, Boolean OSHFLGStr) {
+ 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';
+ results.attList = Database.query(makeSoql(searchName,Date.today(),accountId,ctype));
+ results.result = 'Success';
} catch (Exception e) {
results.result = 'Fail';
results.errorMsg = e.getLineNumber() + '---' + e.getMessage();
@@ -50,16 +42,17 @@
return results;
}
- private static String makeSoql(String CateName, Date timetest, String accountId, String ctype) {
+ 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,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 += ' 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);
soql += ' AND Contract_Decide_End_Date__c >= ' + String.valueOf(timetest).substring(0, 10);
- if (!String.isBlank(CateName)) {
+ if(!String.isBlank(CateName)){
soql += ' AND Name like \'%' + String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) + '%\'';
}
return soql;
--
Gitblit v1.9.1