From 0f44cb1a0b7b36860e9ce81c1eac9e395d87f0b4 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 13:53:18 +0800
Subject: [PATCH] mergecode into lex dtt
---
force-app/main/default/classes/LexSummonsCreatController.cls | 248 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 184 insertions(+), 64 deletions(-)
diff --git a/force-app/main/default/classes/LexSummonsCreatController.cls b/force-app/main/default/classes/LexSummonsCreatController.cls
index 9f94ea4..f83dc7a 100644
--- a/force-app/main/default/classes/LexSummonsCreatController.cls
+++ b/force-app/main/default/classes/LexSummonsCreatController.cls
@@ -779,7 +779,7 @@
// 鍒拌揣璁㈠崟鏉ョ殑鏃跺��
if (getExistarrive()) {
if (editAble) {
- alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫銆�';
+ alertMessage = '鍒拌揣璁㈠崟鐩存帴鍑哄簱锛屽嚭搴撳崟鏄庣粏涓嶅彲缂栬緫';
}
if (coc.SummonsStatus_c__c == '宸叉彁浜�' || coc.SummonsStatus_c__c == '鎵瑰噯') {
system.debug('coc.SummonsStatus_c__c : ' + coc.SummonsStatus_c__c);
@@ -1951,66 +1951,66 @@
res.entity = data;
//璁㈠崟淇℃伅纭
if (coc.SummonsForDirction__c == '' || coc.SummonsForDirction__c == null) {
- // coc.SummonsForDirction__c.addError('璇疯緭鍏ユ寚绀哄崟鐩殑銆�');
+ // coc.SummonsForDirction__c.addError('璇疯緭鍏ユ寚绀哄崟鐩殑');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ寚绀哄崟鐩殑銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ寚绀哄崟鐩殑', '');
} else if (coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌') {
if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
- // coc.addError('璇疯緭鍏ュ尰闄€��');
+ // coc.addError('璇疯緭鍏ュ尰闄�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
}
if (String.isBlank(coc.Order_ForCustomerText__c)) {
- // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+ // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
} else if (String.isNotBlank(SecondDealer) || String.isNotBlank(coc.Order_ForDealerText__c)) {
- // coc.addError('涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅銆�' );
+ // coc.addError('涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅' );
// return null;
- return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅銆�', '');
+ return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佷簩绾х粡閿�鍟嗗拰缁忛攢鍟�(褰曞叆)淇℃伅', '');
}
} else if (coc.SummonsForDirction__c == '鍖婚櫌璇曠敤') {
if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
- // coc.addError('璇疯緭鍏ュ尰闄€��');
+ // coc.addError('璇疯緭鍏ュ尰闄�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
}
if (String.isBlank(coc.Order_ForCustomerText__c)) {
- // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+ // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
}
} else if (coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�') {
if (String.isBlank(SecondDealer) && String.isBlank(coc.Order_ForDealerText__c)) {
- // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�');
+ // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)');
// return null;
- return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)', '');
}
if (String.isBlank(HospitalInfo) || String.isBlank(HospitalName)) {
- // coc.addError('璇疯緭鍏ュ尰闄€��');
+ // coc.addError('璇疯緭鍏ュ尰闄�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄€��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ尰闄�', '');
}
if (String.isBlank(coc.Order_ForCustomerText__c)) {
- // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹ゃ��');
+ // coc.Order_ForCustomerText__c.addError('璇疯緭鍏ョ瀹�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹ゃ��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ョ瀹�', '');
}
} else if (coc.SummonsForDirction__c == '浜掔浉璋冭揣') {
if (String.isNotBlank(HospitalInfo) || String.isNotBlank(HospitalName)) {
- // coc.addError('涓嶉渶瑕佽緭鍏ュ尰闄€��');
+ // coc.addError('涓嶉渶瑕佽緭鍏ュ尰闄�');
// return null;
- return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ュ尰闄€��', '');
+ return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ュ尰闄�', '');
}
if (String.isNotBlank(coc.Order_ForCustomerText__c)) {
- // coc.Order_ForCustomerText__c.addError('涓嶉渶瑕佽緭鍏ョ瀹ゃ��');
+ // coc.Order_ForCustomerText__c.addError('涓嶉渶瑕佽緭鍏ョ瀹�');
// return null;
- return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ョ瀹ゃ��', '');
+ return new ResponseBodyLWC('Error', 500, '涓嶉渶瑕佽緭鍏ョ瀹�', '');
}
if (String.isBlank(SecondDealer) && String.isBlank(coc.Order_ForDealerText__c)) {
- // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�');
+ // coc.addError('蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)');
// return null;
- return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '蹇呴』杈撳叆浜岀骇缁忛攢鍟嗘垨缁忛攢鍟�(褰曞叆)', '');
}
}
@@ -2121,7 +2121,11 @@
return new ResponseBodyLWC(
'Error',
500,
- '缁忛攢鍟�:' + coc.Order_ForDealerText__c + ' 娌℃湁娑堣�楀搧:' + proStr.substring(0, proStr.length() - 1) + ' 鐨勭壒浠�',
+ '缁忛攢鍟�:' +
+ coc.Order_ForDealerText__c +
+ ' 娌℃湁娑堣�楀搧:' +
+ proStr.substring(0, proStr.length() - 1) +
+ ' 鐨勭壒浠�',
''
);
}
@@ -2173,34 +2177,34 @@
for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
if (ass.check == true) {
if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
if (
ass.orderdetails1.Delivery_List_RMB__c == 0 &&
(coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
- // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲忋��');
+ // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲忋��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲�', '');
}
if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
- // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣嶃��');
+ // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣嶃��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣�', '');
}
if (ass.orderdetails1.Box_Piece__c == '鐩�') {
if (ass.orderdetails1.Shipment_Count__c > ass.Boxnumber) {
@@ -2213,7 +2217,9 @@
return new ResponseBodyLWC(
'Error',
500,
- '娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
''
);
}
@@ -2229,7 +2235,9 @@
return new ResponseBodyLWC(
'Error',
500,
- '娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
''
);
}
@@ -2332,29 +2340,29 @@
for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
if (ass.check == true) {
if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ユ纭殑鍑鸿揣鍗曚环 (鍏�)', '');
}
Consumable_orderdetails__c InsAfterDel = new Consumable_orderdetails__c();
if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '鍖婚櫌璇曠敤') {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (
ass.orderdetails1.Delivery_List_RMB__c == 0 &&
(coc.SummonsForDirction__c == '閿�鍞粰浜岀骇缁忛攢鍟�' ||
coc.SummonsForDirction__c == '鐩存帴閿�鍞粰鍖婚櫌')
) {
- // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�');
+ // ass.orderdetails1.Delivery_List_RMB__c.addError('璇疯緭鍏ュ嚭璐у崟浠� (鍏�)');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)銆�', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐у崟浠� (鍏�)', '');
}
if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
- // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣嶃��');
+ // ass.orderdetails1.Box_Piece__c.addError('璇疯緭鍏ュ崟浣�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣嶃��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ崟浣�', '');
}
if (ass.orderdetails1.Box_Piece__c == '鐩�') {
if (ass.orderdetails1.Shipment_Count__c > ass.Boxnumber) {
@@ -2367,7 +2375,9 @@
return new ResponseBodyLWC(
'Error',
500,
- '娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
''
);
}
@@ -2382,16 +2392,18 @@
return new ResponseBodyLWC(
'Error',
500,
- '娑堣�楀搧' + ass.orderdetails1.Consumable_Product__r.Name__c + '搴撳瓨涓嶈冻',
+ '娑堣�楀搧' +
+ ass.orderdetails1.Consumable_Product__r.Name__c +
+ '搴撳瓨涓嶈冻',
''
);
}
}
}
if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
- // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲忋��');
+ // ass.orderdetails1.Shipment_Count__c.addError('璇疯緭鍏ュ嚭璐ф暟閲�');
// return null;
- return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲忋��', '');
+ return new ResponseBodyLWC('Error', 500, '璇疯緭鍏ュ嚭璐ф暟閲�', '');
} else {
String str = string.valueOf(i);
if (str.length() == 1) {
@@ -2501,23 +2513,105 @@
public static List<LookupSearchResult> search(String searchTerm) {
System.debug('searchTerm = ' + searchTerm);
String nameCondition = '';
- nameCondition += '%' + String.escapeSingleQuotes(''.replaceAll('%', '\\%')) + '%';
- List<Account> accs;
+ nameCondition += '%' + String.escapeSingleQuotes(searchTerm.replaceAll('%', '\\%')) + '%';
+ List<Account> accs = new List<Account>();
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()
- ];
+ //鏌ヨ鏉′欢淇敼
+ //绛涢�夊垽鏂潯浠讹細褰撳墠璐㈠勾鐨�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
+ // Date today = Date.today();
+ // Integer thisYear = today.year();
+ // Integer nextYear = today.year() + 1;
+ // Date thisDatetime = Date.newInstance(thisYear, 4, 1);
+ // Date nextDatetime = Date.newInstance(nextYear, 6, 30);
+ // System.debug('thisDatetime = ' + thisDatetime);
+ // System.debug('nextDatetime = ' + nextDatetime);
+ // User UserProTypecTemp = [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
+ // System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+ // System.debug('UserProTypecTemp = ' + UserProTypecTemp);
+ // System.debug('UserProTypecTemp.UserPro_Type__c = ' + UserProTypecTemp.UserPro_Type__c);
+ // if (UserProTypecTemp.UserPro_Type__c == 'ENG') {
+ // accs = [
+ // SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+ // FROM Account
+ // WHERE
+ // // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+ // // AND
+ // Name LIKE :nameCondition
+ // AND RecordType.DeveloperName = 'AgencyContract'
+ // AND Contract_Decide_Start_Date__c >= :thisDatetime
+ // AND Contract_Decide_End_Date__c <= :nextDatetime
+ // AND ENG_Dealer__c = true
+ // ORDER BY Name
+ // LIMIT 49
+ // ];
+ // }
+ // if (UserProTypecTemp.UserPro_Type__c == 'ET') {
+ // accs = [
+ // SELECT Id, Name, Department_Class__c, Department_Class__r.Name, Hospital__c, Hospital__r.Name, BillingCity
+ // FROM Account
+ // WHERE
+ // // Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
+ // // AND
+ // Name LIKE :nameCondition
+ // AND RecordType.DeveloperName = 'AgencyContract'
+ // AND Contract_Decide_Start_Date__c >= :thisDatetime
+ // AND Contract_Decide_End_Date__c <= :nextDatetime
+ // AND ET_SP_Dealer__c = true
+ // ORDER BY Name
+ // LIMIT 49
+ // ];
+ // }
+
+
+ Date today = Date.today();
+ //Date today = Date.newInstance(2023, 3, 1);
+ Integer thisMonth = today.month();
+ System.debug('thisMonth = ' + thisMonth);
+
+ Integer lastYear = today.year() - 1;
+ Integer thisYear = today.year();
+ Integer nextYear = today.year() + 1;
+
+ Date lastDatetime = Date.newInstance(lastYear, 4, 1);
+ Date thisDatetime = Date.newInstance(thisYear, 4, 1);
+ Date thisDatetime2 = Date.newInstance(thisYear, 7, 1);
+ Date nextDatetime = Date.newInstance(nextYear, 7, 1);
+ System.debug('lastDatetime = ' + lastDatetime);
+ System.debug('thisDatetime = ' + thisDatetime);
+ System.debug('thisDatetime2 = ' + thisDatetime2);
+ System.debug('nextDatetime = ' + nextDatetime);
+ System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
+ User UserProTypecTemp = [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
+
+ String sql = 'SELECT id, Parentid FROM Account WHERE Parent.Name LIKE :nameCondition ';
+ if(thisMonth < 4){
+ sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :thisDatetime2 ';
+ }else if(thisMonth >= 4 && thisMonth <= 6){
+ sql += 'AND Contract_Decide_Start_Date__c >= :lastDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
+ }else{
+ sql += 'AND Contract_Decide_Start_Date__c >= :thisDatetime AND Contract_Decide_End_Date__c < :nextDatetime ';
+ }
+ if (UserProTypecTemp.UserPro_Type__c == 'ENG') {
+ sql += 'AND ENG_Dealer__c = true';
+ }
+ if (UserProTypecTemp.UserPro_Type__c == 'ET') {
+ sql += 'AND ET_SP_Dealer__c = true';
+ }
+ System.debug('sql = ' + sql);
+ accs = Database.query(sql);
// 鐢ㄤ簬淇濆瓨鐗圭害缁忛攢鍟嗗尮閰嶅埌鐨勫叾鐖剁被鐨刬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
@@ -2526,11 +2620,37 @@
OR (Name = '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�'
AND Name LIKE :nameCondition))
AND RecordType.DeveloperName = 'Agency'
- 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
+ // ];
+ System.debug('accs = ' + accs);
List<LookupSearchResult> results = new List<LookupSearchResult>();
String accountIcon = 'standard:account';
for (Account account : accs) {
@@ -2564,7 +2684,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
];
@@ -2867,4 +2987,4 @@
@AuraEnabled
public Integer recordEnd { get; set; }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1