Merge pull request '#6008377 Ошибка в выдаче данных по САУБ' (#1) from bug/data_saub into dev

Reviewed-on: http://46.146.209.148:8080/DDrilling/AsbCloudServer/pulls/1
This commit is contained in:
ai.astrakhantsev 2022-09-23 12:07:43 +05:00
commit 8a7e2872ee

View File

@ -134,25 +134,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
if (fullDataCount > 1.75 * approxPointsCount)
{
var m = (int)Math.Round(1d * fullDataCount / approxPointsCount);
switch (m)
{
//case var i when i <= 1: // тут для полноты, но никогда не сработает из-за условия выше
// break;
case var i when i < 10:
query = query.Where((d) => d.DateTime.Second % m == 0);
break;
case var i when i < 30:
query = query.Where((d) => (d.DateTime.Minute * 60 + d.DateTime.Second) % m == 0);
break;
case var i when i < 600:
query = query.Where((d) => ((d.DateTime.Hour * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
break;
default:
query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
break;
}
if (m > 1)
query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
}