优化

Src/Transforms/RestfulStatistic.cs

@@ -11,12 +11,17 @@ namespace Kivii.Finances.Transforms
 {
     public class StatisticResponse<T> : RestfulQueryResponse<T>
     {
+        public DateTime BeginTime { get; set; }
+
+        public DateTime EndTime { get; set; }
+
         public string Description { get; set; }
         public decimal TotalAmount { get; set; }
         public decimal TotalAmountSplited { get; set; }
         public decimal TotalAmountInvoice { get; set; }
         public decimal TotalAmountUsed { get; set; }
         public decimal TotalAmountPayment { get; set; }
+        public decimal TotalAmountUnsettled { get; set; }
         public decimal TotalAmountUnpaid { get; set; }
         public decimal TotalAmountOffset { get; set; }
 
@@ -25,6 +30,7 @@ namespace Kivii.Finances.Transforms
         public decimal TotalQuantityInvoice { get; set; }
         public decimal TotalQuantityUsed { get; set; }
         public decimal TotalQuantityPayment { get; set; }
+        public decimal TotalQuantityUnsettled { get; set; }
         public decimal TotalQuantityUnpaid { get; set; }
         public decimal TotalQuantityOffset { get; set; }
 
@@ -108,6 +114,8 @@ namespace Kivii.Finances.Transforms
 
             var rtns = new StatisticResponse<Invoice>();
             rtns.PopulateWith(results);
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             rtns.TotalAmount = rtns.Results.Sum(o => o.Amount);
             rtns.TotalAmountPayment = rtns.Results.Sum(o => o.AmountPayment);
             return rtns;
@@ -173,6 +181,8 @@ namespace Kivii.Finances.Transforms
 
             var rtns = new StatisticResponse<Settlement>();
             rtns.PopulateWith(results);
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             rtns.TotalAmount = rtns.Results.Where(o => o.Amount >= 0).Sum(o => o.Amount);
             rtns.TotalQuantity = rtns.Results.Where(o => o.Amount >= 0).Count();
             rtns.TotalAmountPayment = rtns.Results.Where(o => o.Amount >= 0 && o.AmountPayment > 0).Sum(o => o.AmountPayment);
@@ -280,6 +290,8 @@ namespace Kivii.Finances.Transforms
             var results = autoQuery.Execute(Request, conn, request, sqlExpress);
             var rtns = new StatisticResponse<Payment>();
             rtns.PopulateWith(results);
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             rtns.TotalAmount = rtns.Results.Where(o => o.Amount >= 0).Sum(o => o.Amount);
             rtns.TotalQuantity = rtns.Results.Where(o => o.Amount >= 0).Count();
             rtns.TotalAmountSplited = rtns.Results.Where(o => o.AmountSplited > 0).Sum(o => o.AmountSplited);
@@ -327,7 +339,8 @@ namespace Kivii.Finances.Transforms
             var rtns = new StatisticResponse<Analysis>();
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Results = new List<Analysis>();
-
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             var queryDetails = conn.From<AccountDetail>();
             queryDetails.Where(o => Sql.In(o.AccountKvid, queryKvids));
             queryDetails.And(o => o.CreateTime >= BeginTime && o.CreateTime < EndTime);
@@ -408,7 +421,8 @@ namespace Kivii.Finances.Transforms
             var rtns = new StatisticResponse<Analysis>();
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Results = new List<Analysis>();
-
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             foreach (var item in results)
             {
                 item.Summary = item.OperateTime.ToString("yyyy-MM");
@@ -499,7 +513,8 @@ namespace Kivii.Finances.Transforms
             var rtns = new StatisticResponse<Settlement>();
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Results = new List<Settlement>();
-
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             foreach (var item in results)
             {
                 item.Summary = item.CreateTime.ToString("yyyy-MM");
@@ -617,6 +632,8 @@ namespace Kivii.Finances.Transforms
 
             var rtns = new StatisticResponse<Payment>();
             //rtns.Description = "待认领流水";
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Total = results.Count();
             rtns.TotalAmount = results.Sum(o => o.Amount);
@@ -766,10 +783,12 @@ namespace Kivii.Finances.Transforms
             var results = conn.Select(sqlExpress);
 
             var rtns = new StatisticResponse<Payment>();
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             rtns.Description = "已结算未收费";
             if (results.IsNullOrEmpty()) return rtns;
-            rtns.TotalAmount = results.Sum(o => o.Amount - o.AmountPayment);
-            rtns.TotalQuantity = results.Count();
+            rtns.TotalAmountUnpaid = results.Sum(o => o.Amount - o.AmountPayment);
+            rtns.TotalQuantityUnpaid = results.Count();
             return rtns;
         }
     }
@@ -812,7 +831,8 @@ namespace Kivii.Finances.Transforms
             var rtns = new StatisticResponse<Analysis>();
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Results = new List<Analysis>();
-
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             foreach (var item in results)
             {
                 item.Summary = item.OperateTime.ToString("yyyy-MM");
@@ -916,7 +936,8 @@ namespace Kivii.Finances.Transforms
             var rtns = new StatisticResponse<Analysis>();
             if (results.IsNullOrEmpty()) return rtns;
             rtns.Results = new List<Analysis>();
-
+            rtns.BeginTime = BeginTime;
+            rtns.EndTime = EndTime;
             foreach (var item in results)
             {
                 item.Summary = item.CreateTime.ToString("yyyy-MM");