xiaoguo75131
/
CVDEMCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.98.89.94:3000/xiaoguo75131/CVDEMCS

Browse Source
main
xiaoguo 1 year ago
parent b559e59f17 ce553a5523
commit 5dcb4f73c9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File

7
CVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
Unescape Escape View File

@ -742,7 +742,7 @@ namespace PVDEMCS.Services.Repositories.Impl
if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM")) if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM"))
{ {
//初尝值不包括今天 //初尝值不包括今天
// days = now.Day - 1; days = now.Day - 1;
//获取当月到当前的分钟 //获取当月到当前的分钟
minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute; minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
} }
@ -816,7 +816,7 @@ namespace PVDEMCS.Services.Repositories.Impl
WHERE WHERE
info.id = '{equipmentId}' info.id = '{equipmentId}'
AND total_day >= '{beg}' AND total_day >= '{beg}'
AND total_day <= '{endDate}' AND total_day <= '{end}'
GROUP BY GROUP BY
EquipmentId, EquipmentId,
EquipmentType"; EquipmentType";
@ -858,9 +858,8 @@ namespace PVDEMCS.Services.Repositories.Impl
{ {
days = Convert.ToDecimal((endDate - begDate).TotalDays); 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 * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
} }
else else

Write Preview
Loading…
Cancel
Save