Commit 7f1c0692 by 陶然

优化

parent 93020b66
...@@ -266,6 +266,19 @@ namespace Kivii.Finances.Transforms ...@@ -266,6 +266,19 @@ namespace Kivii.Finances.Transforms
QuantityNotUsed = Sql.Sum(o.AmountUsed < o.Amount ? 1 : 0) QuantityNotUsed = Sql.Sum(o.AmountUsed < o.Amount ? 1 : 0)
}); });
rtns.Results = conn.Select<Analysis>(query); rtns.Results = conn.Select<Analysis>(query);
if (!rtns.Results.IsNullOrEmpty())
{
rtns.TotalAmount = rtns.Results.Sum(o => o.Amount);
rtns.TotalAmountInvoice = rtns.Results.Sum(o => o.AmountInvoice);
rtns.TotalAmountNotInvoice = rtns.Results.Sum(o => o.AmountNotInvoice);
rtns.TotalAmountUsed = rtns.Results.Sum(o => o.AmountUsed);
rtns.TotalAmountNotUsed = rtns.Results.Sum(o => o.AmountNotUsed);
rtns.TotalQuantity = rtns.Results.Sum(o => o.Quantity);
rtns.TotalQuantityInvoice = rtns.Results.Sum(o => o.QuantityInvoice);
rtns.TotalQuantityNotInvoice = rtns.Results.Sum(o => o.QuantityNotInvoice);
rtns.TotalQuantityUsed = rtns.Results.Sum(o => o.QuantityUsed);
rtns.TotalQuantityNotUsed = rtns.Results.Sum(o => o.QuantityNotUsed);
}
} }
else else
{ {
...@@ -289,6 +302,22 @@ namespace Kivii.Finances.Transforms ...@@ -289,6 +302,22 @@ namespace Kivii.Finances.Transforms
QuantityNotUsed = Sql.Sum(o.AmountUsed < o.Amount ? 1 : 0) QuantityNotUsed = Sql.Sum(o.AmountUsed < o.Amount ? 1 : 0)
}); });
rtns.Results = conn.Select<Analysis>(queryRoot); rtns.Results = conn.Select<Analysis>(queryRoot);
if (!rtns.Results.IsNullOrEmpty())
{
rtns.TotalAmount = rtns.Results.Sum(o => o.Amount);
rtns.TotalAmountSplited = rtns.Results.Sum(o => o.AmountSplit);
rtns.TotalAmountNotSplited = rtns.Results.Sum(o => o.AmountNotSplit);
rtns.TotalAmountInvoice = rtns.Results.Sum(o => o.AmountInvoice);
rtns.TotalAmountNotInvoice = rtns.Results.Sum(o => o.AmountNotInvoice);
rtns.TotalAmountUsed = rtns.Results.Sum(o => o.AmountUsed);
rtns.TotalAmountNotUsed = rtns.Results.Sum(o => o.AmountNotUsed);
rtns.TotalQuantity = rtns.Results.Sum(o => o.Quantity);
rtns.TotalQuantityNotSplited = rtns.Results.Sum(o => o.QuantityNotSplit);
rtns.TotalQuantityInvoice = rtns.Results.Sum(o => o.QuantityInvoice);
rtns.TotalQuantityNotInvoice = rtns.Results.Sum(o => o.QuantityNotInvoice);
rtns.TotalQuantityUsed = rtns.Results.Sum(o => o.QuantityUsed);
rtns.TotalQuantityNotUsed = rtns.Results.Sum(o => o.QuantityNotUsed);
}
} }
rtns.Total = rtns.Results.Count(); rtns.Total = rtns.Results.Count();
......
...@@ -18,6 +18,7 @@ namespace Kivii.Finances.Transforms ...@@ -18,6 +18,7 @@ namespace Kivii.Finances.Transforms
public string Description { get; set; } public string Description { get; set; }
public decimal TotalAmount { get; set; } public decimal TotalAmount { get; set; }
public decimal TotalAmountSplited { get; set; } public decimal TotalAmountSplited { get; set; }
public decimal TotalAmountNotSplited { get; set; }
public decimal TotalAmountInvoice { get; set; } public decimal TotalAmountInvoice { get; set; }
public decimal TotalAmountNotInvoice { get; set; } public decimal TotalAmountNotInvoice { get; set; }
public decimal TotalAmountUsed { get; set; } public decimal TotalAmountUsed { get; set; }
...@@ -31,6 +32,7 @@ namespace Kivii.Finances.Transforms ...@@ -31,6 +32,7 @@ namespace Kivii.Finances.Transforms
public decimal TotalQuantity { get; set; } public decimal TotalQuantity { get; set; }
public decimal TotalQuantitySplited { get; set; } public decimal TotalQuantitySplited { get; set; }
public decimal TotalQuantityNotSplited { get; set; }
public decimal TotalQuantityInvoice { get; set; } public decimal TotalQuantityInvoice { get; set; }
public decimal TotalQuantityNotInvoice { get; set; } public decimal TotalQuantityNotInvoice { get; set; }
public decimal TotalQuantityUsed { get; set; } public decimal TotalQuantityUsed { get; set; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment