diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php index c91be7381..3ee82eb3c 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowMonthLists.php @@ -46,7 +46,7 @@ class StoreFinanceFlowMonthLists extends BaseAdminDataLists implements ListsSear return StoreFinanceFlow::where($this->searchWhere) ->field(' CONCAT(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), "年", MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), "月") as date, - SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income, + SUM(CASE WHEN financial_pm = 1 AND financial_type = 1 THEN number ELSE 0 END) as income, SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as expenditure ') ->limit($this->limitOffset, $this->limitLength) diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php index 00513e499..41c2386dc 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowWeekLists.php @@ -46,7 +46,7 @@ class StoreFinanceFlowWeekLists extends BaseAdminDataLists implements ListsSearc return StoreFinanceFlow::where($this->searchWhere) ->field(' CONCAT("第", LPAD(YEAR(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 4, "0"), "-", LPAD(WEEK(FROM_UNIXTIME(create_time, "%Y-%m-%d"), 3), 2, "0"), "周(", LPAD(MONTH(FROM_UNIXTIME(create_time, "%Y-%m-%d")), 2, "0"), "月)") as date, - SUM(CASE WHEN financial_pm = 1 THEN number ELSE 0 END) as income, + SUM(CASE WHEN financial_pm = 1 AND financial_type = 1 THEN number ELSE 0 END) as income, SUM(CASE WHEN financial_pm = 0 THEN number ELSE 0 END) as expenditure ') ->limit($this->limitOffset, $this->limitLength)