调整借支金额规则

be100193 · guanzhenshan · 42ca387c · be100193 · be100193
Commit be100193 authored Apr 14, 2020 by guanzhenshan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

FinanceReportServices.cs Bailun.DC.Services/FinanceReportServices.cs +2 -2

Index.cshtml Bailun.DC.Web/Pages/Index.cshtml +2 -2

No files found.
--- a/Bailun.DC.Services/FinanceReportServices.cs
+++ b/Bailun.DC.Services/FinanceReportServices.cs
@@ -1802,7 +1802,7 @@ namespace Bailun.DC.Services
        public List<dc_daily_fee> ListBorrowAmount(BtTableParameter request, DateTime date, int? companyvalue, ref int total)
        {
            //只取百伦主体的
-            var sql = "select * from dc_daily_fee where company_value in (53,3,5,60,66,59,50,8,1,61,2,70) and  cost_status>-1 and recoed_time='" + date.ToString("yyyy-MM-dd")+"'";
+            var sql = "select * from dc_daily_fee where company_value in (53,3,5,60,66,59,50,8,1,61,2) and  cost_status>-1 and recoed_time='" + date.ToString("yyyy-MM-dd")+"'";

            if (companyvalue.HasValue && companyvalue.Value>0)
            {
@@ -1842,7 +1842,7 @@ namespace Bailun.DC.Services
        public dc_daily_fee ListBorrowAmountCount(DateTime date, int? companyvalue)
        {
            //只取百伦主体的
-            var sql = "select sum((amount - had_pay + ifnull(compensate, 0)) * to_rmb_rate) amount from dc_daily_fee where company_value in (53,3,5,60,66,59,50,8,1,61,2,70) and  cost_status>-1 and recoed_time='" + date.ToString("yyyy-MM-dd") + "'";
+            var sql = "select sum((amount - had_pay + ifnull(compensate, 0)) * to_rmb_rate) amount from dc_daily_fee where company_value in (53,3,5,60,66,59,50,8,1,61,2) and  cost_status>-1 and recoed_time='" + date.ToString("yyyy-MM-dd") + "'";

            if (companyvalue.HasValue && companyvalue.Value > 0)
            {

--- a/Bailun.DC.Web/Pages/Index.cshtml
+++ b/Bailun.DC.Web/Pages/Index.cshtml
@@ -29,8 +29,8 @@

 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
    <script type="text/javascript">
-        login_localhost();
-        //login();
+        //login_localhost();
+        login();
        window.location = "@Url.Content("~/Home/Main")";
    </script>
 </body>