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 2df2544..aa69e7d 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 @@ -135,6 +135,7 @@ public class ChandanFragment extends BaseFragment { public void onClick(View view) { Intent intent = new Intent(getActivity(),PoultryReportChandanActvity.class); intent.putExtra("BreedFactory_ID",(long)view.getTag()); + intent.putExtra("time",choseDate); startActivity(intent); } }); diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java index d516ed5..16c87a2 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java @@ -15,6 +15,7 @@ import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.ui.LinkedHorizontalScrollView; import com.qhclh.ytzh.ui.NoScrollHorizontalScrollView; +import com.qhclh.ytzh.utils.DateTimeUtil; import com.qhclh.ytzh.work.tablepoultry.LvBuildhousenaneAdapter; import org.forks.jsonrpc.JsonRpcResult; @@ -22,7 +23,9 @@ import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcObject; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import butterknife.BindView; @@ -53,6 +56,7 @@ public class PoultryReportActvity extends BaseActivity { private List reportBeanList; private long BreedFactory_ID; + private long time; @Override protected int setLayoutId() { return R.layout.act_poultry_report; @@ -73,6 +77,7 @@ public class PoultryReportActvity extends BaseActivity { @Override protected void initData() { BreedFactory_ID = getIntent().getLongExtra("BreedFactory_ID",-1); + time = getIntent().getLongExtra("time",0); buildhouseList = new ArrayList<>(); reportBeanList = new ArrayList<>(); } @@ -155,7 +160,7 @@ public class PoultryReportActvity extends BaseActivity { @Override public Object call() throws Exception { - JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseTotalInfoCount1,BreedFactory_ID); + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseTotalInfoCount1,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))),BreedFactory_ID); rpcList = result.getRpcObjectList(RpcUrl.HouseTotalInfoCount1_fanhui); return null; } diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java index e713d74..050f336 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java @@ -15,6 +15,7 @@ import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.ui.LinkedHorizontalScrollView; import com.qhclh.ytzh.ui.NoScrollHorizontalScrollView; +import com.qhclh.ytzh.utils.DateTimeUtil; import com.qhclh.ytzh.work.tablepoultry.LvBuildhousenaneAdapter; import org.forks.jsonrpc.JsonRpcResult; @@ -22,7 +23,9 @@ import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcObject; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import butterknife.BindView; @@ -53,6 +56,7 @@ public class PoultryReportChandanActvity extends BaseActivity { private List reportBeanList; private long BreedFactory_ID; + private long time; @Override protected int setLayoutId() { return R.layout.act_poultry_chandan_report; @@ -73,6 +77,7 @@ public class PoultryReportChandanActvity extends BaseActivity { @Override protected void initData() { BreedFactory_ID = getIntent().getLongExtra("BreedFactory_ID",-1); + time = getIntent().getLongExtra("time",0); buildhouseList = new ArrayList<>(); reportBeanList = new ArrayList<>(); } @@ -158,7 +163,7 @@ public class PoultryReportChandanActvity extends BaseActivity { @Override public Object call() throws Exception { - JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseTotalInfoCount2,BreedFactory_ID); + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseTotalInfoCount2,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))),BreedFactory_ID); rpcList = result.getRpcObjectList(RpcUrl.HouseTotalInfoCount1_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 3f56ba7..d97e64f 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 @@ -140,6 +140,7 @@ public class YuchuFragment extends BaseFragment { public void onClick(View view) { Intent intent = new Intent(getActivity(),PoultryReportActvity.class); intent.putExtra("BreedFactory_ID",(long)view.getTag()); + intent.putExtra("time",choseDate); startActivity(intent); } });