Browse Source

Synchronization code

pull/36/head
sunkaixuan 1 year ago
parent
commit
d2a9e319ee
  1. 7
      Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
  2. 11
      Src/Asp.NetCore2/SqlSugar/IntegrationServices/SplitTableService.cs
  3. 1
      Src/Asp.NetCore2/SqlSugar/SpliteTable/SplitType.cs

7
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs

@ -1302,6 +1302,13 @@ namespace SqlSugar
result = result.Where(y =>
y.Date >= begtinWeek&& y.Date <= endWeek).ToList();
}
else if (SplitType.Month_6 == type.SplitType)
{
var begtinWeek = beginTime.Month<=6?beginTime.ToString("yyyy-01-01"): beginTime.ToString("yyyy-06-01");
var endWeek = endTime.Month <= 6 ? endTime.ToString("yyyy-07-01") : endTime.ToString("yyyy-12-01");
result = result.Where(y =>
y.Date >= begtinWeek.ObjToDate() && y.Date <= endWeek.ObjToDate().AddMonths(1).AddDays(-1)).ToList();
}
else if (SplitType.Season == type.SplitType)
{

11
Src/Asp.NetCore2/SqlSugar/IntegrationServices/SplitTableService.cs

@ -102,6 +102,8 @@ namespace SqlSugar
break;
case SplitType.Year:
break;
case SplitType.Month_6:
break;
default:
throw new Exception("DateSplitTableService no support " + splitType.ToString());
}
@ -222,6 +224,15 @@ namespace SqlSugar
}
case SplitType.Year:
return Convert.ToDateTime(time.ToString("yyyy-01-01"));
case SplitType.Month_6:
if (time.Month <= 6)
{
return Convert.ToDateTime(time.ToString("yyyy-01-01"));
}
else
{
return Convert.ToDateTime(time.ToString("yyyy-07-01"));
}
default:
throw new Exception($"SplitType parameter error ");
}

1
Src/Asp.NetCore2/SqlSugar/SpliteTable/SplitType.cs

@ -11,6 +11,7 @@ namespace SqlSugar
Day = 0,
Week = 1,
Month = 2,
Month_6=1000,
Season = 3,
Year = 4,
_Custom01 = 5,

Loading…
Cancel
Save