Commit 30b13371 by GhostUI

fix

parent a4bbae70
......@@ -22,6 +22,7 @@ namespace Bailun.DC.Models.Dtos.Finance
#region 明细
public string CompanyName { get; set; }
public string FeeType { get; set; }
public bool IsPage { get; set; } = false;
#endregion
}
}
......@@ -172,6 +172,12 @@ and s2.company_type = @CorporateEntity ";
sql += " and s1.type_name=@type and s1.company_name = @companyname";
para.Add("type", input.FeeType);
para.Add("companyname", input.CompanyName);
if (input.IsPage)
{
sql += "limit @limit offset @offset";
para.Add("limit", (input.PageIndex - 1) * input.PageNumber);
para.Add("offset", input.PageNumber);
}
}
var data = SimpleCRUD.Query<dc_base_finance_fee>(sql, para, GlobalConfig.ConnectionString).ToList();
foreach (var item in data)
......@@ -198,6 +204,7 @@ and s2.company_type = @CorporateEntity ";
{
try
{
//input.IsPage = true;
var data = GetFinanceFeeList(input);
var dto = data.Select(x => new FinanceDetailsDto
{
......@@ -214,6 +221,12 @@ and s2.company_type = @CorporateEntity ";
x.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
ReceiveUnit = x.bank_company
}).ToList();
dto.Add(new FinanceDetailsDto
{
FeeId = "合计",
AmountRmb = dto.Sum(x=>x.AmountRmb),
Amount = dto.Sum(x=>x.Amount)
});
return new CommonApiResponseDto<List<FinanceDetailsDto>> { Data = dto };
}
catch (Exception e)
......
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