From c1a1c72c2047917c63d9033b19e1541bcdffc77c Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Tue, 18 Jun 2024 14:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3OEE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PVDEMCS/.vs/PVDEMCS/v17/.suo | Bin 257024 -> 152576 bytes .../Impl/EquipmentRecordRepository.cs | 16 +++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo index 637e00b1639f4d6b82416c1999dd9d7185a007be..8b90d7431bf359d832129ee263cf677bcf960516 100644 GIT binary patch delta 10749 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 diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs index 1e8a0fa..281d58a 100644 --- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs +++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs @@ -743,10 +743,9 @@ namespace PVDEMCS.Services.Repositories.Impl if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM")) { //初尝值不包括今天 - //days = now.Day - 1; - days = now.Day; + days = now.Day - 1; //获取当月到当前的分钟 - minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute; + minutes = days * 24 * 60 + now.Hour * 60 + now.Minute; } else { @@ -754,7 +753,7 @@ namespace PVDEMCS.Services.Repositories.Impl if (sptr.Length == 2) { days = DateTime.DaysInMonth(int.Parse(sptr[0]), int.Parse(sptr[1])); - minutes = days * 60 * 24; + minutes = days * 24 * 60; } } @@ -818,7 +817,7 @@ namespace PVDEMCS.Services.Repositories.Impl WHERE info.id = '{equipmentId}' AND total_day >= '{beg}' - AND total_day <= '{endDate}' + AND total_day <= '{end}' GROUP BY EquipmentId, EquipmentType"; @@ -860,14 +859,13 @@ namespace PVDEMCS.Services.Repositories.Impl { days = Convert.ToDecimal((endDate - begDate).TotalDays); } - if (end == DateTime.Now.ToString("yyyy-MM-dd")) + if (endDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")) { - //days = days - 1; - minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute; + minutes = days * 24 * 60 + now.Hour * 60 + now.Minute; } else { - minutes = days * 60 * 24; + minutes = days * 24 * 60; } var value = 0m;