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/EquipmentSetShippmentReceived3Controller.cls |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index ec7d5ab..a5975f0 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -563,7 +563,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;
@@ -574,7 +574,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;
@@ -647,7 +647,8 @@
             return null;
         } 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);
             done_flg = false;
             return null;

--
Gitblit v1.9.1