From 38360319d18354c2299d23161dfb8d398f62bf00 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期四, 17 三月 2022 17:30:17 +0800
Subject: [PATCH] 【委托】【phase5上线课题131】-增加明细的时长字段“提交申请到备品出库时长”
---
force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
index a8cdc30..47923d3 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -1,3 +1,4 @@
+// RentalFixtureSetAssignAgencyCtrlTest
public with sharing class RentalFixtureSetAssignAgencyController {
public List<EsdInfo> esdList { get; set; }
public FixtureDeliverySlip__c slip { get; set; }
@@ -48,6 +49,7 @@
+ ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you
+ ', Equipment_Type_F__c' //20210508 LJH ADD 1672
+ ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start
+ + ', Campaign__r.IF_Approved__c' // 20220315 ljh add
+ ', Campaign__r.Meeting_Approved_No__c' // 20220315 ljh add
+ ', Campaign__r.Approved_Status__c' // 20220315 ljh add
+ ' FROM Rental_Apply__c'
@@ -1854,7 +1856,7 @@
if(ocList[0].IsWorkDay__c == 0){
for(OlympusCalendar__c oc:ocList){
if(oc.IsWorkDay__c == 1){
- startTime = oc.Date__c;
+ startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0);
startDate = oc.Date__c;
startFlag = true;
break;
@@ -1865,7 +1867,7 @@
if(ocList[ocList.size() - 1].IsWorkDay__c == 0){
for(Integer i = ocList.size() - 1; i <= 0;i--){
if(ocList[i].IsWorkDay__c == 1){
- endTime = ocList[i].Date__c.addDays(1);
+ endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0);
endDate = ocList[i].Date__c.addDays(1);
endFlag = true;
break;
@@ -1943,7 +1945,8 @@
}
catch (Exception ex) {
system.debug('=====' + ex.getMessage());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
+ ApexPages.addMessages(ex);
Database.rollback(sp);
// 杩愯緭鍗曟彃鍏ユ垚鍔燂紝浣嗘槑缁嗘垨鐢宠鏇存柊澶辫触鏃讹紝杩愯緭鍗曠殑鍋嘔d瑕佹竻鎺�
if(insertSlip) {
--
Gitblit v1.9.1