Commit 43d040b6 by 泽锋 李

支出用负数形式表现

parent c2059d30
...@@ -83,7 +83,7 @@ namespace AutoTurnOver.DB ...@@ -83,7 +83,7 @@ namespace AutoTurnOver.DB
update_date = DateTime.Now update_date = DateTime.Now
}; };
data.val = _connection.QueryFirstOrDefault<decimal?>(@"select sum(cashier_paymoneyrmb) from dc_base_finance_cashier where cashier_status = 1 data.val =0 - _connection.QueryFirstOrDefault<decimal?>(@"select sum(cashier_paymoneyrmb) from dc_base_finance_cashier where cashier_status = 1
and (type_name is null or type_name != '') and (type_name is null or type_name != '')
and tradeb_bjectname not in @bodys and tradeb_bjectname not in @bodys
and ( tradeb_bjectname like '%公司%' or tradeb_bjectname like '%厂%' or tradeb_bjectname like '%经营%' or tradeb_bjectname like '%经销%' or tradeb_bjectname like '%商行%' ) and ( tradeb_bjectname like '%公司%' or tradeb_bjectname like '%厂%' or tradeb_bjectname like '%经营%' or tradeb_bjectname like '%经销%' or tradeb_bjectname like '%商行%' )
...@@ -175,7 +175,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new ...@@ -175,7 +175,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new
item_name = item.product_type_desc ?? "未知", item_name = item.product_type_desc ?? "未知",
item_id = item.product_type.ToString(), item_id = item.product_type.ToString(),
date = b_this_time, date = b_this_time,
val = item.platform_fee, val = 0 - item.platform_fee,
update_date = DateTime.Now update_date = DateTime.Now
}); });
datas.Add(new dc_report_finance() datas.Add(new dc_report_finance()
...@@ -184,7 +184,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new ...@@ -184,7 +184,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new
item_name = item.product_type_desc ?? "未知", item_name = item.product_type_desc ?? "未知",
item_id = item.product_type.ToString(), item_id = item.product_type.ToString(),
date = b_this_time, date = b_this_time,
val = item.cost_product, val = 0 - item.cost_product,
update_date = DateTime.Now update_date = DateTime.Now
}); });
...@@ -194,7 +194,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new ...@@ -194,7 +194,7 @@ GROUP BY t2.product_type,t2.product_type_desc", new
item_name = item.product_type_desc ?? "未知", item_name = item.product_type_desc ?? "未知",
item_id = item.product_type.ToString(), item_id = item.product_type.ToString(),
date = b_this_time, date = b_this_time,
val = item.cost_first, val = 0 - item.cost_first,
update_date = DateTime.Now update_date = DateTime.Now
}); });
datas.Add(new dc_report_finance() datas.Add(new dc_report_finance()
...@@ -360,7 +360,7 @@ GROUP BY t2.product_type,t2.product_type_desc ", new ...@@ -360,7 +360,7 @@ GROUP BY t2.product_type,t2.product_type_desc ", new
item_name = item.product_type_desc ?? "未知", item_name = item.product_type_desc ?? "未知",
item_id = item.product_type.ToString(), item_id = item.product_type.ToString(),
date = b_this_time, date = b_this_time,
val = item.amount_refund_rmb, val = 0- item.amount_refund_rmb,
update_date = DateTime.Now update_date = DateTime.Now
}); });
} }
...@@ -435,7 +435,7 @@ where `statistical_time`>=@b_this_time ", new ...@@ -435,7 +435,7 @@ where `statistical_time`>=@b_this_time ", new
item_name = "还款现金流出", item_name = "还款现金流出",
item_id = "还款现金流出", item_id = "还款现金流出",
date = b_this_time, date = b_this_time,
val = val < 0 ? val : 0, val = 0 - (val < 0 ? val : 0),
update_date = DateTime.Now update_date = DateTime.Now
}); });
...@@ -655,7 +655,7 @@ where `statistical_time`>=@b_this_time ", new ...@@ -655,7 +655,7 @@ where `statistical_time`>=@b_this_time ", new
var this_date = btime; var this_date = btime;
while (this_date <= etime) while (this_date <= etime)
{ {
months.Add($" {this_date.ToString("yyyy-MM")}"); months.Add($"{this_date.ToString("yyyy-MM")}");
this_date = this_date.AddMonths(1); this_date = this_date.AddMonths(1);
} }
......
...@@ -55,15 +55,17 @@ namespace AutoTurnOver.Models ...@@ -55,15 +55,17 @@ namespace AutoTurnOver.Models
}).ToList() }).ToList()
}).ToList(); }).ToList();
} }
ms.Add(new tree_menu_dto {
name="test", //ms.Add(new tree_menu_dto {
url = "/view/reports/finance.html", //name="test",
child = new List<tree_menu_dto> { //url = "/view/reports/finance.html",
new tree_menu_dto { //child = new List<tree_menu_dto> {
name="test", //new tree_menu_dto {
url = "/view/reports/finance.html" //name="test",
}} //url = "/view/reports/finance.html"
}); //}}
//});
return ms; return ms;
} }
......
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