diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java index c56b4d3..bfe810f 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java @@ -202,7 +202,7 @@ public class CarsManageActivity extends BaseActivity1 implements CalendarDialogF break; case R.id.sc_factry: - + break; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FactryidBean.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FactryidBean.java new file mode 100644 index 0000000..71d8725 --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FactryidBean.java @@ -0,0 +1,21 @@ +package com.qhclh.ytzh.work.carsmannage; + +/** + * Created by 青花瓷 on 2018/5/7. + */ + +public class FactryidBean { + private long id; + + public FactryidBean(long id) { + this.id = id; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } +} diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java index 2922631..2700bb1 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java @@ -22,6 +22,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; +import java.util.Map; import butterknife.BindView; @@ -39,6 +40,10 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. private List scanBeanList; private CarsInfosGAdapter adapter; + + private long userID; + private long factryID; + private long choseTime; @Override protected int setLayout() { return R.layout.fragment_grosschicken; @@ -55,6 +60,8 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. @Override protected void initData() { scanBeanList = new ArrayList<>(); + page = 0; + Query(userID,factryID,choseTime); } @Override @@ -73,11 +80,9 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. @Override public void onResume() { super.onResume(); - page = 0; - Query(); } - private void Query() { + private void Query(final long userid,final long factryid,final long time) { ViewOnClickTask queryTask = new ViewOnClickTask(getActivity(),"加载中...") { List rpcObj; @Override @@ -112,6 +117,11 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. select.add("Car_Name"); select.add("BreedFactory_Name"); + Map where = queryObj.getMap("Where"); + where.put("User_ID",userid); + where.put("BreedFactory_ID",factryid); + where.put("CreateTime",time/1000); + List orderList = queryObj.getList("OrderBy"); RpcObject orderBy = RpcObject.create(RpcUrl.DayProductRpc_Query_order); orderBy.setString("Name", "CreateTime"); @@ -132,12 +142,12 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. @Override public void run() { rfl_gross.setLoading(false); - querymore(); + querymore(userID,factryID,choseTime); } },1000); } - private void querymore() { + private void querymore(final long userid, final long factryid, final long time) { page++; ViewOnClickTask queryTask = new ViewOnClickTask(getActivity(),"加载中...") { List rpcObj; @@ -171,6 +181,11 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. select.add("Car_Name"); select.add("BreedFactory_Name"); + Map where = queryObj.getMap("Where"); + where.put("User_ID",userid); + where.put("BreedFactory_ID",factryid); + where.put("CreateTime",time/1000); + List orderList = queryObj.getList("OrderBy"); RpcObject orderBy = RpcObject.create(RpcUrl.DayProductRpc_Query_order); orderBy.setString("Name", "CreateTime"); @@ -187,7 +202,21 @@ public class GrossChickenFragment extends BaseFragment implements RefreshLayout. @Subscribe(threadMode = ThreadMode.MAIN) public void onEvent(TimeEvent event){ - + choseTime = event.getTime(); + page = 0; + Query(userID,factryID,choseTime); + } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEvent(UseridBean event){ + userID = event.getId(); + page = 0; + Query(userID,factryID,choseTime); + } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEvent(FactryidBean event){ + factryID = event.getId(); + page = 0; + Query(userID,factryID,choseTime); } @Override diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/UseridBean.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/UseridBean.java new file mode 100644 index 0000000..5bb2464 --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/UseridBean.java @@ -0,0 +1,21 @@ +package com.qhclh.ytzh.work.carsmannage; + +/** + * Created by 青花瓷 on 2018/5/7. + */ + +public class UseridBean { + private long id; + + public UseridBean(long id) { + this.id = id; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } +}