From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index cbb12a6..fff27b0 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -617,17 +617,8 @@
robj.Cancel_Select__c = false;
robj.Cancel_Reason__c = '';
robj.Rental_Start_Date__c = RentalStartDateMap.containsKey(esd.tempOldRaesIdSub)?RentalStartDateMap.get(esd.tempOldRaesIdSub):craes.Rental_Start_Date__c ;
- switch on parentObj.demo_purpose2__c{
- when '璇曠敤锛堟棤璇环锛�','璇曠敤锛堟湁璇环锛�','鏂颁骇鍝佽瘎浠�','鍏朵粬','鍗忚鍊熺敤' {
- robj.Rental_End_Date__c = robj.Rental_Start_Date__c + intValueOf(parentObj.Hope_Lonaer_date_Num__c);
- }
- when '涓�鑸敤鎴�','淇濅慨鐢ㄦ埛','甯傚満澶氬勾淇濅慨','鍐嶄慨鐞�','绱㈣禂QIS','宸茶喘寰呰揣','鏁呴殰鎺掓煡' {
- robj.Rental_End_Date__c = robj.Rental_Start_Date__c + 30;
- }
- when '瀛︿細灞曚細' {
- robj.Rental_End_Date__c = parentObj.Campaign_EndDate_F__c + 5;
- }
- }
+ robj.Rental_End_Date__c = setRentalEndDate(robj.Rental_Start_Date__c, parentObj);
+
//robj.Rental_End_Date__c = robj.Rental_Start_Date__c + Integer.valueOf(craes.Test_Day__c);
// 鏂拌褰� Canceled__c & Canceled_Id__c 涓洪�変腑涓�瑙堢殑Id
robj.Canceled__c = craes.canDelete__c?craes.Canceled__c:craes.Id;
@@ -1709,6 +1700,7 @@
if(!isRaStatusOK()) {
return;
}
+
Id userId = Userinfo.getUserId(); // 20210624 ljh add SFDC-C448GR
Datetime now = System.now();
if(isSameCity) {
@@ -1738,7 +1730,16 @@
if(raesd.Is_Body__c) {
mainIdList.add(raesd.Asset__c);
raesIdSet.add(esd.rec.Rental_Apply_Equipment_Set__c);
+
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 start
+ // 澶囧搧棰勮鍑哄簱鏃ュ簲璇ョ瓑浜庝粖澶╋紝鍚﹀垯涓嶈兘鍙戣揣
+ if( esd.rec.Rental_Apply_Equipment_Set__r.Rental_Start_Date__c != Date.today() ){
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '澶囧搧棰勮鍑鸿揣鏃ュ簲璇ョ瓑浜庝粖澶╋紝鍚﹀垯涓嶈兘鍙戣揣!'));
+ return;
+ }
+ // add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
}
+
// 鍒嗛厤鏃朵复鏃跺彇娑堢殑鍦ㄥ彂璐у悗褰诲簳鍙栨秷
if(raesd.AgencyTempCancel__c) {
raesd.Cancel_Select__c = true;
@@ -1941,8 +1942,9 @@
// 鍚屽煄鏃惰嚜鍔ㄦ敹璐�
if(isSameCity && !raesIdSet.isEmpty()) {
List<Rental_Apply_Equipment_Set__c> raesList = new List<Rental_Apply_Equipment_Set__c>();
+ Date rentalEndDate = setRentalEndDate(Date.today(), parentObj);
for(Id raesId:raesIdSet) {
- raesList.add(new Rental_Apply_Equipment_Set__c(Id=raesId, Received_Confirm__c = 'OK'));
+ raesList.add(new Rental_Apply_Equipment_Set__c(Id=raesId, Received_Confirm__c = 'OK', Rental_Start_Date__c = Date.today(), Rental_End_Date__c = rentalEndDate));
}
FixtureUtil.withoutUpdate(raesList);
}
@@ -1962,6 +1964,24 @@
}
}
+ public Date setRentalEndDate(Date startDate, Rental_Apply__c rentalApplyObj) {
+ Date endDate = null;
+ switch on rentalApplyObj.demo_purpose2__c{
+ when '璇曠敤锛堟棤璇环锛�','璇曠敤锛堟湁璇环锛�','鏂颁骇鍝佽瘎浠�','鍏朵粬','鍗忚鍊熺敤' {
+ endDate = startDate + intValueOf(rentalApplyObj.Hope_Lonaer_date_Num__c);
+ }
+ when '涓�鑸敤鎴�','淇濅慨鐢ㄦ埛','甯傚満澶氬勾淇濅慨','鍐嶄慨鐞�','绱㈣禂QIS','宸茶喘寰呰揣','鏁呴殰鎺掓煡' {
+ endDate = startDate + 30;
+ }
+ when '瀛︿細灞曚細' {
+ endDate = rentalApplyObj.Campaign_EndDate_F__c + 5;
+ }
+ }
+
+ return endDate;
+ }
+
+
public class EsdInfo {
public Rental_Apply_Equipment_Set_Detail__c rec { get; set; }
public Boolean checked {get;set;}
--
Gitblit v1.9.1