From 5ea22ff9c20f49da1dd4e07bf726493112fa442d Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 8 Sep 2021 19:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E7=9B=8AgetIncomeTo?=
 =?UTF-8?q?tal=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0hallId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_hall/hall/activity/IncomeStatisticsActivity.java   | 4 ++--
 .../yizhuan/erban/module_hall/income/DayIncomeFragment.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
index f301eccc2..b4876e1a5 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
@@ -236,7 +236,7 @@ public class IncomeStatisticsActivity extends BaseMvpActivity<IIncomeStatisticsV
             tvMonthDayEnd.setVisibility(View.GONE);
 
             tvMonthDayStart.setText(String.format(getString(R.string.format_month_day), dayArray[1], dayArray[2]));
-            list.get(0).getIncomeTotal(day, "");
+            list.get(0).getIncomeTotal(hallId,day, "");
 
         } else if (mCurrentType == TYPE_WEEK) {
             String[] weekFirstArray = weekFirstDay.split("-");
@@ -247,7 +247,7 @@ public class IncomeStatisticsActivity extends BaseMvpActivity<IIncomeStatisticsV
             tvMonthDayEnd.setVisibility(View.VISIBLE);
             tvMonthDayStart.setText(String.format(getString(R.string.format_month_day), weekFirstArray[1], weekFirstArray[2]));
             tvMonthDayEnd.setText(String.format(getString(R.string.format_month_day), weekLastArray[1], weekLastArray[2]));
-            list.get(1).getIncomeTotal(weekFirstDay, weekLastDay);
+            list.get(1).getIncomeTotal(hallId,weekFirstDay, weekLastDay);
         }
 
     }
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
index 60bddd852..4780c7c81 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
@@ -87,7 +87,7 @@ public class DayIncomeFragment extends BaseMvpFragment<IIncomeView, IncomePresen
     public void initiate() {
     }
 
-    public void getIncomeTotal(String startTimeStr, String endTimeStr) {
+    public void getIncomeTotal(long hallId, String startTimeStr, String endTimeStr) {
         mStartTimeStr = startTimeStr;
         mEndTimeStr = endTimeStr;