fix 移除group by
This commit is contained in:
@@ -465,13 +465,13 @@ public class AppointmentService : IAppointmentService
|
|||||||
foreach (var gainfo in todoGainfos)
|
foreach (var gainfo in todoGainfos)
|
||||||
{
|
{
|
||||||
//获取最近一次通行记录的时间,如果没有则取创建时间
|
//获取最近一次通行记录的时间,如果没有则取创建时间
|
||||||
DateTime? raiseDateTime = await _dbContext.Queryable<DeviceUploadLogEntity>()
|
DateTime raiseDateTime = await _dbContext.Queryable<DeviceUploadLogEntity>()
|
||||||
.Where(x => x.UserUniqueNo == gainfo.Code)
|
.Where(x => x.UserUniqueNo == gainfo.Code)
|
||||||
.WhereIF(uploadLogAdditionalExp != null, uploadLogAdditionalExp)
|
.WhereIF(uploadLogAdditionalExp != null, uploadLogAdditionalExp)
|
||||||
.Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), gainfo.CreateTime))
|
.Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), gainfo.CreateTime))
|
||||||
.SingleAsync();
|
.SingleAsync();
|
||||||
|
|
||||||
var checkDates = GetDaysUntilToday(raiseDateTime.Value);
|
var checkDates = GetDaysUntilToday(raiseDateTime);
|
||||||
var days = checkDates.Count;
|
var days = checkDates.Count;
|
||||||
foreach (var date in checkDates)
|
foreach (var date in checkDates)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -163,10 +163,10 @@ public class GainfoOutsourceService : IGainfoOutsourceService
|
|||||||
|
|
||||||
foreach (var outsource in grp)
|
foreach (var outsource in grp)
|
||||||
{
|
{
|
||||||
|
//获取最近一次通行记录的时间,如果没有则取创建时间
|
||||||
DateTime raiseDateTime = await _dbContext.Queryable<DeviceUploadLogEntity>()
|
DateTime raiseDateTime = await _dbContext.Queryable<DeviceUploadLogEntity>()
|
||||||
.Where(x => x.UserUniqueNo == outsource.Code)
|
.Where(x => x.UserUniqueNo == outsource.Code)
|
||||||
.Where(x => x.TenantId == grp.Key) //本厂区的
|
.Where(x => x.TenantId == grp.Key) //本厂区的
|
||||||
.GroupBy(x => x.UserUniqueNo)
|
|
||||||
.Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), outsource.CreateTime))
|
.Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), outsource.CreateTime))
|
||||||
.SingleAsync();
|
.SingleAsync();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user