Skip to content

D
DataCenter_Core2.1_20190520
Commit 13a36237 by guanzhenshan
Options

修改管理成本导出，改为从库表的数据源导出

parent ca37ff09
Showing with 69 additions and 32 deletions
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
...@@ -1034,42 +1034,77 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1034,42 +1034,77 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns> /// <returns></returns>
public ActionResult ExportListAdministrativeCost(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub) public ActionResult ExportListAdministrativeCost(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub)
{ {
var url = ConfigHelper.GetByName("FeeUrl") + "?o=0"; //var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd"); //url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
//if (paycompanyid.HasValue && paycompanyid.Value > 0)
//{
// url += "&companyValue=" + paycompanyid.Value;
//}
//if (!string.IsNullOrEmpty(headname))
//{
// if (type == 1)
// {
// url += "&departmentName=" + headname;
// }
// else
// {
// url += "&companyValue=" + headname;
// }
//}
//if (!string.IsNullOrEmpty(categoryname))
//{
// if (issub == 0)
// {
// url += "&feeSuperType=" + categoryname;
// }
// else
// {
// url += "&feeSubType=" + categoryname;
// }
//}
if (paycompanyid.HasValue && paycompanyid.Value > 0)
{
url += "&companyValue=" + paycompanyid.Value;
}
if (!string.IsNullOrEmpty(headname)) if (!string.IsNullOrEmpty(headname))
{ {
if (type == 1) if (type == 1)
{ {
url += "&departmentName=" + headname; //url += "&departmentName=" + headname;
} }
else else
{ {
url += "&companyValue=" + headname; var objPayCompany = new Services.FinanceReportServices().GetPayCompanyByName(headname);
if (objPayCompany != null)
{
paycompanyid = objPayCompany.company_value;
}
} }
} }
if (!string.IsNullOrEmpty(categoryname)) //if (!string.IsNullOrEmpty(categoryname))
{ //{
if (issub == 0) // if (issub == 0)
{ // {
url += "&feeSuperType=" + categoryname; // url += "&feeSuperType=" + categoryname;
} // }
else // else
{ // {
url += "&feeSubType=" + categoryname; // url += "&feeSubType=" + categoryname;
} // }
} //}
//var obj = new Services.FinanceReportServices().ListOtherCost(url);
var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, (issub == 0 ? categoryname : ""), (issub != 0 ? categoryname : ""), (type == 1 ? headname : ""), paycompanyid);
var obj = new Services.FinanceReportServices().ListOtherCost(url);
var colNames = new List<string> {"部门名称","付款主体名称","父级分类", "子分类", "金额", var colNames = new List<string> {"部门名称","付款主体名称","父级分类", "子分类", "金额",
"币种", "人民币金额" }; "币种", "人民币金额" };
...@@ -1077,8 +1112,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1077,8 +1112,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = new List<string>(); var list = new List<string>();
foreach (var item in obj) foreach (var item in obj)
{ {
list.Add(item.departmentName + "|" + item.companyName + "|" + item.feeSuperType + "|" + item.feeSubType + "|" + item.amount + "|" + list.Add(item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.fee_sub_type + "|" + item.amount + "|" +
item.currency + "|" + item.amountRmb item.currency + "|" + item.amount_rmb
); );
} }
...@@ -1106,17 +1141,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1106,17 +1141,19 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns> /// <returns></returns>
public IActionResult ExportAdministrativeCost(DateTime start, DateTime end, int? paycompanyid) public IActionResult ExportAdministrativeCost(DateTime start, DateTime end, int? paycompanyid)
{ {
var url = ConfigHelper.GetByName("FeeUrl") + "?o=0"; //var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd"); //url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
if (paycompanyid.HasValue && paycompanyid.Value > 0) //if (paycompanyid.HasValue && paycompanyid.Value > 0)
{ //{
url += "&companyValue=" + paycompanyid.Value; // url += "&companyValue=" + paycompanyid.Value;
} //}
//var obj = new Services.FinanceReportServices().ListOtherCost(url);
var obj = new Services.FinanceReportServices().ListOtherCost(url); var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, "", "", "", paycompanyid);
var colNames = new List<string> {"部门名称","付款主体名称","父级分类", "子分类", "金额", var colNames = new List<string> {"部门名称","付款主体名称","父级分类", "子分类", "金额",
"币种", "人民币金额" }; "币种", "人民币金额" };
...@@ -1124,8 +1161,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1124,8 +1161,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = new List<string>(); var list = new List<string>();
foreach (var item in obj) foreach (var item in obj)
{ {
list.Add(item.departmentName+"|"+item.companyName+"|"+item.feeSuperType+"|"+item.feeSubType+"|"+item.amount+"|"+ list.Add(item.department_name+"|"+item.company_name+"|"+item.fee_super_type+"|"+item.fee_sub_type+"|"+item.amount+"|"+
item.currency+"|"+item.amountRmb item.currency+"|"+item.amount_rmb
); );
} }
......
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