Commit 900dc4eb by 陶然

优化

parent 6dbad5c0
...@@ -88,7 +88,7 @@ namespace Kivii.Finances ...@@ -88,7 +88,7 @@ namespace Kivii.Finances
var currentAmount = (amount <= (settlement.Amount - settlement.AmountPayment) ? amount : (settlement.Amount - settlement.AmountPayment)); var currentAmount = (amount <= (settlement.Amount - settlement.AmountPayment) ? amount : (settlement.Amount - settlement.AmountPayment));
var pay = new Pay(); var pay = new Pay();
pay.BizId = settlement.SerialNumber; pay.BizId = settlement.BizId;
pay.BizKvid = settlement.Kvid; pay.BizKvid = settlement.Kvid;
pay.BizType = typeof(Settlement).FullName; pay.BizType = typeof(Settlement).FullName;
pay.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid; pay.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid;
...@@ -202,7 +202,7 @@ namespace Kivii.Finances ...@@ -202,7 +202,7 @@ namespace Kivii.Finances
var currentAmount = amount <= (settlement.Amount - settlement.AmountPayment) ? amount : (settlement.Amount - settlement.AmountPayment); var currentAmount = amount <= (settlement.Amount - settlement.AmountPayment) ? amount : (settlement.Amount - settlement.AmountPayment);
var pay = new Pay(); var pay = new Pay();
pay.BizId = settlement.SerialNumber; pay.BizId = settlement.BizId;
pay.BizKvid = settlement.Kvid; pay.BizKvid = settlement.Kvid;
pay.BizType = typeof(Settlement).FullName; pay.BizType = typeof(Settlement).FullName;
pay.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid; pay.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid;
......
...@@ -652,6 +652,8 @@ namespace Kivii.Finances.Transforms ...@@ -652,6 +652,8 @@ namespace Kivii.Finances.Transforms
#endregion #endregion
public Guid AccountKvid { get; set; }
public override object OnExecution(IRequest req, IResponse res) public override object OnExecution(IRequest req, IResponse res)
{ {
var conn = KiviiContext.GetOpenedDbConnection<Pay>(); var conn = KiviiContext.GetOpenedDbConnection<Pay>();
...@@ -661,9 +663,9 @@ namespace Kivii.Finances.Transforms ...@@ -661,9 +663,9 @@ namespace Kivii.Finances.Transforms
var request = new RestfulQuery<Pay>(); var request = new RestfulQuery<Pay>();
request = request.PopulateWith(this); request = request.PopulateWith(this);
var sqlExpress = autoQuery.CreateQuery(Request, conn, request, dynamicParams); var sqlExpress = autoQuery.CreateQuery(Request, conn, request, dynamicParams);
if (AccountKvid != Guid.Empty) sqlExpress.Where(o => (o.ToType == PayType.Account && o.ToKvid == AccountKvid) || (o.FromType == PayType.Account && o.FromKvid == AccountKvid));
var rtns = autoQuery.Execute(Request, conn, request, sqlExpress); var rtns = autoQuery.Execute(Request, conn, request, sqlExpress);
return rtns; return rtns;
} }
} }
} }
...@@ -91,6 +91,10 @@ namespace Kivii.Finances.Transforms ...@@ -91,6 +91,10 @@ namespace Kivii.Finances.Transforms
accountDetails.ForEach(o => o.Insert(conn)); accountDetails.ForEach(o => o.Insert(conn));
payment.RecalculateAmountUsed(conn);//重新计算AmountUsed!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! payment.RecalculateAmountUsed(conn);//重新计算AmountUsed!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//if (parentPayment != null) conn.UpdateOnly(parentPayment); //if (parentPayment != null) conn.UpdateOnly(parentPayment);
foreach (var item in pays)
{
conn.Insert(item);
}
trans.Commit(); trans.Commit();
} }
catch (Exception ex) catch (Exception ex)
......
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