|
@@ -7932,24 +7932,41 @@ GROUP BY
|
|
|
ORDER BY
|
|
|
CNYTotal ASC", beginDt, endDt);
|
|
|
|
|
|
- var dailyItems = await _sqlSugar.Queryable<Fin_DailyFeePayment, Sys_SetData, Sys_SetDataType, Sys_Company>((dfp, sd, sdt, c) =>
|
|
|
- new JoinQueryInfos(
|
|
|
- JoinType.Left, dfp.PriceTypeId == sd.Id,
|
|
|
- JoinType.Left, sd.STid == sdt.Id,
|
|
|
- JoinType.Left, dfp.CompanyId == c.Id
|
|
|
- )).Select((dfp, sd, sdt, c) => new DailyInfo()
|
|
|
- {
|
|
|
- Id = dfp.Id,
|
|
|
- PriceParentTypeId = sdt.Id,
|
|
|
- PriceParentTypeName = sdt.Name,
|
|
|
- PriceTypeId = sd.Id,
|
|
|
- PriceTypeName = sd.Name,
|
|
|
- CompanyName = c.CompanyName,
|
|
|
- Instructions = dfp.Instructions,
|
|
|
- CNYTotal = dfp.SumPrice,
|
|
|
- //PriceInfos = SqlFunc.Subqueryable<Fin_DailyFeePaymentContent>().Where(dfpc => dfp.IsDel == 0 && dfp.Id == dfpc.DFPId).ToList()
|
|
|
- })
|
|
|
- .ToListAsync();
|
|
|
+ //var dailyItems = await _sqlSugar.Queryable<Fin_DailyFeePayment, Sys_SetData, Sys_SetDataType, Sys_Company>((dfp, sd, sdt, c) =>
|
|
|
+ // new JoinQueryInfos(
|
|
|
+ // JoinType.Left, dfp.PriceTypeId == sd.Id,
|
|
|
+ // JoinType.Left, sd.STid == sdt.Id,
|
|
|
+ // JoinType.Left, dfp.CompanyId == c.Id
|
|
|
+ // ))
|
|
|
+
|
|
|
+ // .Select((dfp, sd, sdt, c) => new DailyInfo()
|
|
|
+ // {
|
|
|
+ // Id = dfp.Id,
|
|
|
+ // PriceParentTypeId = sdt.Id,
|
|
|
+ // PriceParentTypeName = sdt.Name,
|
|
|
+ // PriceTypeId = sd.Id,
|
|
|
+ // PriceTypeName = sd.Name,
|
|
|
+ // CompanyName = c.CompanyName,
|
|
|
+ // Instructions = dfp.Instructions,
|
|
|
+ // CNYTotal = dfp.SumPrice,
|
|
|
+ // PriceInfos = SqlSugar.SqlFunc.Subqueryable<Fin_DailyFeePaymentContent>()
|
|
|
+ // .Where(x => x.IsDel == 0 && dfp.Id == x.DFPId)
|
|
|
+ // .Select(x => new DailyPriceInfo()
|
|
|
+ // {
|
|
|
+ // Id = x.Id,
|
|
|
+ // DFPId = x.DFPId,
|
|
|
+ // PriceName = x.PriceName,
|
|
|
+ // Price = x.Price,
|
|
|
+ // Quantity = x.Quantity,
|
|
|
+ // ItemTotal = x.ItemTotal,
|
|
|
+ // Remark = x.Remark
|
|
|
+ // }).ToList()
|
|
|
+ // })
|
|
|
+ // .ToListAsync();
|
|
|
+
|
|
|
+ // var
|
|
|
+
|
|
|
+
|
|
|
view.GroupItems = groupItems;
|
|
|
//view.DailyItems = dailyItems;
|
|
|
return view;
|