|
@@ -3586,16 +3586,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
|
|
|
Subtotal = SqlFunc.AggregateSum(SqlFunc.IIF(it.Status > EOrderStatus.WaitForAccept, 1, 0))//排除待受理工单
|
|
|
})
|
|
|
- .MergeTable()
|
|
|
- .LeftJoin<User>((p, u) => p.UserId == u.Id)
|
|
|
- .Select((p, u) => new OrderBiCentreDataListVo
|
|
|
+ .LeftJoin<User>((it, u) => it.UserId == u.Id)
|
|
|
+ .Select((it, u) => new OrderBiCentreDataListVo
|
|
|
{
|
|
|
- UserId = p.UserId,
|
|
|
+ UserId = it.UserId,
|
|
|
UserName = u.Name,
|
|
|
- CentreArchive = p.CentreArchive,
|
|
|
- CentreCareOf = p.CentreCareOf,
|
|
|
- NoCentreCareOf = p.NoCentreCareOf,
|
|
|
- Subtotal = p.Subtotal
|
|
|
+ CentreArchive = it.CentreArchive,
|
|
|
+ CentreCareOf = it.CentreCareOf,
|
|
|
+ NoCentreCareOf = it.NoCentreCareOf,
|
|
|
+ Subtotal = it.Subtotal
|
|
|
}).MergeTable()
|
|
|
;
|
|
|
switch (dto.SortField)
|