|
@@ -960,7 +960,6 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
|
|
|
var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
|
|
|
.Where(p => p.GenerationTime >= dto.StartTime && p.GenerationTime <= dto.EndTime)
|
|
|
.Where(p => p.LastTime >= dto.StartTime && p.LastTime <= dto.EndTime && p.IsSuccess == ESendTaskState.PushSuccess)
|
|
|
- .Where(p => p.CaseSource == "RGDH")
|
|
|
.Select(p => new
|
|
|
{
|
|
|
index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.ProvinceNo}"),
|
|
@@ -975,7 +974,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
|
|
|
p.CaseSource
|
|
|
})
|
|
|
.MergeTable()
|
|
|
- .Where(d => d.index == 1)
|
|
|
+ .Where(d => d.index == 1 && p.CaseSource == "RGDH")
|
|
|
.MergeTable()
|
|
|
.LeftJoin(queryableCall, (o, c) => o.ProvinceNo == c.ProvinceNo)
|
|
|
.Select((o, c) => new
|
|
@@ -1835,7 +1834,7 @@ WHERE ""CreationTime"">='{0}' AND ""CreationTime""<='{1}' and ""IsSuccess""=1 an
|
|
|
";
|
|
|
|
|
|
strsql = string.Format(strsql, dto.StartTime, dto.EndTime, dto.StartTime.Value.AddMonths(-3));
|
|
|
-
|
|
|
+
|
|
|
return _waitSendTaskRepository.GetDataAggregationSituation(strsql);
|
|
|
|
|
|
}
|