From 71b93327e8f3fb3bffffc7c033c1f782e7b6ab32 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 22 五月 2023 17:37:16 +0800
Subject: [PATCH] test
---
force-app/main/default/classes/LexSummonsCreatController.cls | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index cee85a3..c1f910d 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -2521,32 +2521,53 @@
nameCondition += '%' + String.escapeSingleQuotes(''.replaceAll('%', '\\%')) + '%';
List<Account> accs;
System.debug('nameCondition = ' + nameCondition);
- accs = [
- SELECT id, Parentid
- FROM Account
- WHERE
- Parent.Name LIKE :nameCondition
- AND Contract_Decide_Start_Date__c <= :Date.Today()
- AND Contract_Decide_End_Date__c >= :Date.Today()
- ];
-
- // 鐢ㄤ簬淇濆瓨鐗圭害缁忛攢鍟嗗尮閰嶅埌鐨勫叾鐖剁被鐨刬d
- Set<String> pids = new Set<String>();
- for (Account acc : accs) {
- pids.add(acc.Parentid);
- }
+ //鏌ヨ鏉′欢淇敼
+ //绛涢�夊垽鏂潯浠讹細褰撳墠璐㈠勾鐨�4/1 ~ 绗簩骞寸殑6/30 聽& ET or ENG绫诲瀷 & 褰撳墠鐢ㄦ埛绫诲瀷
+ //1 and 2
+ //1. Integer year 2022/4/1 ~ 2023/6/30
+ //寮�濮嬫棩鏈� + 缁撴潫鏃ユ湡
+ //Contract_Decide_Start_Date__c>=寮�濮嬫棩鏈� and Contract_Decide_End_Date__c<缁撴潫鏃ユ湡
+ //2. 娣诲姞缁忛攢鍟嗗厑閿�绫诲瀷锛欵T缁忛攢鍟嗗崗璁紱ENG鑰楁潗缁忛攢鍟嗗崗璁�
+ //鍙栧綋鍓嶇敤鎴风殑绫诲瀷锛屽鏋滅敤鎴风被鍨嬫槸ET,ET缁忛攢鍟嗗崗璁� = true
accs = [
SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
FROM Account
WHERE
- (Id IN :pids
- OR (Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
- AND Name LIKE :nameCondition))
+ Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+ AND Name LIKE :nameCondition
AND RecordType.DeveloperName = 'Agency'
- AND Is_Active__c != '鐒″姽'
+ //And 1 And 2
+ //AND Is_Active__c != '鐒″姽'
ORDER BY Name
- LIMIT 5
+ LIMIT 49
];
+
+ // accs = [
+ // SELECT id, Parentid
+ // FROM Account
+ // WHERE
+ // Parent.Name LIKE :nameCondition
+ // AND Contract_Decide_Start_Date__c <= :Date.Today()
+ // AND Contract_Decide_End_Date__c >= :Date.Today()
+ // ];
+
+ // 鐢ㄤ簬淇濆瓨鐗圭害缁忛攢鍟嗗尮閰嶅埌鐨勫叾鐖剁被鐨刬d
+ // Set<String> pids = new Set<String>();
+ // for (Account acc : accs) {
+ // pids.add(acc.Parentid);
+ // }
+ // accs = [
+ // SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+ // FROM Account
+ // WHERE
+ // (Id IN :pids
+ // OR (Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+ // AND Name LIKE :nameCondition))
+ // AND RecordType.DeveloperName = 'Agency'
+ // AND Is_Active__c != '鐒″姽'
+ // ORDER BY Name
+ // LIMIT 5
+ // ];
List<LookupSearchResult> results = new List<LookupSearchResult>();
String accountIcon = 'standard:account';
@@ -2581,7 +2602,7 @@
Map<String, object> data = new Map<String, object>();
res.entity = data;
List<ContentVersion> cvList = [
- SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate
+ SELECT id, Title, CreatedBy.Name, PathOnClient, CreatedDate,ContentDocumentId
FROM ContentVersion
WHERE FirstPublishLocationId = :recordId
];
--
Gitblit v1.9.1