fix

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -328,21 +328,47 @@ and s2.company_type = @CorporateEntity ";
 
         private List<ManagementCost> GetManagementCostList(GetCashFlowStatementInput input)
         {
-            var sql = $@"select *
-from dc_base_finance_management_cost s1
-LEFT JOIN dc_base_finance_fee s2
-ON s1.management_cost_type = s2.cost_form
+//            var sql = $@"select *
+//from dc_base_finance_management_cost s1
+//LEFT JOIN dc_base_finance_fee s2
+//ON s1.management_cost_type = s2.cost_form
+//and s1.management_cost_category = s2.accounting_subject_name
+//and s1.management_cost_title = s2.type_name
+//LEFT JOIN dc_base_finance_company s3 
+//ON s3.company_name = s2.company_name
+//where s2.cost_status = 4
+//and (s2.is_lend is null or s2.is_lend = 1
+//or (s2.is_lend = 2 and s2.lend_balance > 0) or (s2.is_lend = 2 and s2.cost_form = 1))
+//and s2.pay_time >= @paytimeStrat 
+//and s2.pay_time < @paytimeEnd
+//and s3.company_type = @companyType ";
+            var sql = @"SELECT 
+s2.amount,s2.cost_form,s2.amount_rmb,
+s2.is_lend,s2.lend_balance,
+s2.company_name,s2.dic,s2.department_name,
+s2.type_name,s2.cost_no,s2.accounting_subject_name,
+s2.cost_reason,s2.cost_remark,s2.pay_time,s2.bank_company,
+s1.management_cost_name
+FROM dc_base_finance_fee AS s2
+INNER JOIN dc_base_finance_management_cost AS s1 ON s1.management_cost_type = s2.cost_form
 and s1.management_cost_category = s2.accounting_subject_name
 and s1.management_cost_title = s2.type_name
-LEFT JOIN dc_base_finance_company s3 
-ON s3.company_name = s2.company_name
-where s2.cost_status = 4
+WHERE  s2.cost_status = 4
 and (s2.is_lend is null or s2.is_lend = 1
 or (s2.is_lend = 2 and s2.lend_balance > 0) or (s2.is_lend = 2 and s2.cost_form = 1))
-and s2.pay_time >= '{input.PaymentTimeStart.Date}' 
-and s2.pay_time < '{input.PaymentTimeEnd.AddDays(1).Date}'
-and s3.company_type = {input.CorporateEntity} ";
+ AND s2.company_name IN(
+SELECT company_name FROM dc_base_finance_company WHERE company_type = @companyType
+) and s2.pay_time >=  @paytimeStrat 
+and s2.pay_time < @paytimeEnd ";
             var para = new DynamicParameters();
+            para.Add("paytimeStrat", input.PaymentTimeStart.Date);
+            para.Add("paytimeEnd", input.PaymentTimeEnd.AddDays(1).Date);
+            para.Add("companyType", input.CorporateEntity);
+            if (input.IsStatistics.HasValue)
+            {
+                sql += " and s1.is_statistics = @status";
+                para.Add("status", input.IsStatistics.Value);
+            }
             if (!string.IsNullOrEmpty(input.CompanyName) &&
                 !string.IsNullOrEmpty(input.FeeType))
             {