From 86e06208bae3f2898b37bcd6e5f3c324cf09b1d6 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Tue, 10 Apr 2018 09:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=B2=E9=9B=8F=E8=82=B2=E6=88=90=E6=9C=9F?=
 =?UTF-8?q?=20=20=E4=BA=A7=E8=9B=8B=E6=9C=9F=20=E5=A2=9E=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ytzh/work/Poultrydailyreport/ChandanFragment.java | 11 +++++++----
 .../ytzh/work/Poultrydailyreport/YuchuFragment.java   | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/ChandanFragment.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/ChandanFragment.java
index f310305..2df2544 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/ChandanFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/ChandanFragment.java
@@ -10,6 +10,7 @@ import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
+import com.qhclh.ytzh.utils.DateTimeUtil;
 import com.qhclh.ytzh.work.tablepoultry.ChoseEvent;
 
 import org.forks.jsonrpc.JsonRpcResult;
@@ -20,6 +21,8 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import butterknife.BindView;
@@ -58,13 +61,13 @@ public class ChandanFragment extends BaseFragment {
     @Override
     public void onResume() {
         super.onResume();
-        BatchTotalCount2();
+        BatchTotalCount2(choseDate);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN,sticky = true)
     public void onEvent(ChoseEvent event){
         choseDate = event.getTime();
-        System.out.println("aaa+++chandanf+++"+choseDate);
+        BatchTotalCount2(choseDate);
     }
 
     @Override
@@ -79,7 +82,7 @@ public class ChandanFragment extends BaseFragment {
 
     }
 
-    private void BatchTotalCount2() {
+    private void BatchTotalCount2(final long time) {
         ViewOnClickTask BatchTotalCount2Task = new ViewOnClickTask(getActivity(),"加载中...") {
             List<RpcObject> rpcStr;
             @Override
@@ -140,7 +143,7 @@ public class ChandanFragment extends BaseFragment {
 
             @Override
             public Object call() throws Exception {
-                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.BatchTotalCount2);
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.BatchTotalCount2,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))));
                 rpcStr = result.getRpcObjectList(RpcUrl.BatchTotalCount1_fanhui);
                 return null;
             }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java
index 04dceea..3f56ba7 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java
@@ -14,6 +14,7 @@ import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
+import com.qhclh.ytzh.utils.DateTimeUtil;
 import com.qhclh.ytzh.work.tablepoultry.ChoseEvent;
 
 import org.forks.jsonrpc.JsonRpcResult;
@@ -25,7 +26,9 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONArray;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import butterknife.BindView;
@@ -64,13 +67,13 @@ public class YuchuFragment extends BaseFragment {
     @Override
     public void onResume() {
         super.onResume();
-        BatchTotalCount1();
+        BatchTotalCount1(choseDate);
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN,sticky = true)
     public void onEvent(ChoseEvent event){
         choseDate = event.getTime();
-        System.out.println("aaa+++yuchuf+++"+choseDate);
+        BatchTotalCount1(choseDate);
     }
 
     @Override
@@ -84,7 +87,7 @@ public class YuchuFragment extends BaseFragment {
         }
 
     }
-    private void BatchTotalCount1() {
+    private void BatchTotalCount1(final long time) {
         ViewOnClickTask BatchTotalCount1Task = new ViewOnClickTask(getActivity(),"加载中...") {
             List<RpcObject> rpcStr;
             @Override
@@ -145,7 +148,7 @@ public class YuchuFragment extends BaseFragment {
 
             @Override
             public Object call() throws Exception {
-                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.BatchTotalCount1);
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.BatchTotalCount1,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))));
                 rpcStr = result.getRpcObjectList(RpcUrl.BatchTotalCount1_fanhui);
                 return null;
             }