From e42a9df5ac26b05cc8d35728bfd9f9d323bff73a Mon Sep 17 00:00:00 2001
From: 一生一代一双人 <754543560@qq.com>
Date: 星期二, 01 三月 2022 10:52:17 +0800
Subject: [PATCH] 测试提交
---
force-app/main/default/classes/RentalApplyWebService.cls | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 24ff3ab..15d4306 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -430,11 +430,15 @@
}
//1388 yc 20211021 璺ㄥ尯鍩熷垎閰嶄笉鑳藉嚭搴� end
// 20220211 ljh add 澶囧搧FY23璇鹃01 start
- /*AggregateResult[] resultsET = [SELECT Rental_Start_Date__c,count(Id) cnt
+ AggregateResult[] resultsRas = [SELECT Rental_Start_Date__c,count(Id) cnt
FROM Rental_Apply_Equipment_Set__c
- WHERE Rental_Apply__c = :rentalApplyId
- Cancel_Select__c = false
- group by Rental_Start_Date__c];*/
+ WHERE Rental_Apply__c = :rentalApplyId
+ AND Cancel_Select__c = false
+ group by Rental_Start_Date__c];
+ If(resultsRas.size() > 1){
+ returnStr = '鎵�鏈変竴瑙堝鍝侀璁″嚭璐ф棩搴斾竴鑷达紝涓嶄竴鑷翠笉鑳藉仛鍑哄簱鎸囩ず';
+ return returnStr;
+ }
// 20220211 ljh add 澶囧搧FY23璇鹃01 end
//bp2 // 澶囧搧鍊熷嚭鍘嗗彶鍙栧緱
@@ -1688,6 +1692,7 @@
if (!raess.isEmpty()) {
update raess;
}
+
return '鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�';
} else {
Database.rollback(sp);
--
Gitblit v1.9.1