Skip to content

D
DataCenter_Core2.1_20190520
Commit 475ddaa9 by GhostUI
Options

fix

parent bd7ac948
Showing with 2 additions and 2 deletions
Bailun.DC.Services/WebApiService/FinanceService.cs
...@@ -201,7 +201,7 @@ and s1.pay_time >= @PaymentTimeStart and s1.pay_time < @PaymentTimeEnd ...@@ -201,7 +201,7 @@ and s1.pay_time >= @PaymentTimeStart and s1.pay_time < @PaymentTimeEnd
and s2.company_type = @CorporateEntity "; and s2.company_type = @CorporateEntity ";
var para = new DynamicParameters(); var para = new DynamicParameters();
para.Add("PaymentTimeStart", input.PaymentTimeStart.Date); para.Add("PaymentTimeStart", input.PaymentTimeStart.Date);
para.Add("PaymentTimeEnd", input.PaymentTimeEnd.Date); para.Add("PaymentTimeEnd", input.PaymentTimeEnd.AddDays(1).Date);
para.Add("CorporateEntity", input.CorporateEntity); para.Add("CorporateEntity", input.CorporateEntity);
if (!string.IsNullOrWhiteSpace(input.CompanyName) if (!string.IsNullOrWhiteSpace(input.CompanyName)
&& !string.IsNullOrWhiteSpace(input.FeeType)) && !string.IsNullOrWhiteSpace(input.FeeType))
...@@ -246,7 +246,7 @@ and s2.company_type = @CorporateEntity "; ...@@ -246,7 +246,7 @@ and s2.company_type = @CorporateEntity ";
var dto = data.Select(x => new FinanceDetailsDto var dto = data.Select(x => new FinanceDetailsDto
{ {
Amount = Convert.ToDecimal(x.amount), Amount = Convert.ToDecimal(x.amount),
AmountRmb = Convert.ToDecimal(x.amount), AmountRmb = Convert.ToDecimal(x.amount_rmb),
CompanyName = x.company_name, CompanyName = x.company_name,
Currency = x.dic, Currency = x.dic,
DepartmentName = x.department_name, DepartmentName = x.department_name,
......
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