diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index 142267a..fcdd09f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,7 +1,7 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); void disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index 142267a..fcdd09f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,7 +1,7 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); void disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eb3e3e1..703d1b1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -48,7 +48,7 @@ private CaseListResultAdapter adapter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String startTime; private String endTime; private String eorc; @@ -88,12 +88,12 @@ weakReferenceHandler = new WeakReferenceHandler(this); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); - statusId = getIntent().getStringExtra("statusId"); + caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } @@ -105,7 +105,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); @@ -114,7 +114,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index 142267a..fcdd09f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,7 +1,7 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); void disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eb3e3e1..703d1b1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -48,7 +48,7 @@ private CaseListResultAdapter adapter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String startTime; private String endTime; private String eorc; @@ -88,12 +88,12 @@ weakReferenceHandler = new WeakReferenceHandler(this); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); - statusId = getIntent().getStringExtra("statusId"); + caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } @@ -105,7 +105,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); @@ -114,7 +114,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 30762e9..a28c249 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -65,7 +65,7 @@ private CaseStatusPresenterImpl caseStatusPresenter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String eorc; @Override @@ -206,7 +206,7 @@ Intent intent = new Intent(this, CaseListResultActivity.class); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); - intent.putExtra("statusId", statusId); + intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); intent.putExtra("eorc", eorc); @@ -283,7 +283,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - statusId = beans.get(position).getId(); + caseState = beans.get(position).getValue(); caseStatusView.setText(tag); caseStatusView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index 142267a..fcdd09f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,7 +1,7 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); void disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eb3e3e1..703d1b1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -48,7 +48,7 @@ private CaseListResultAdapter adapter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String startTime; private String endTime; private String eorc; @@ -88,12 +88,12 @@ weakReferenceHandler = new WeakReferenceHandler(this); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); - statusId = getIntent().getStringExtra("statusId"); + caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } @@ -105,7 +105,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); @@ -114,7 +114,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 30762e9..a28c249 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -65,7 +65,7 @@ private CaseStatusPresenterImpl caseStatusPresenter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String eorc; @Override @@ -206,7 +206,7 @@ Intent intent = new Intent(this, CaseListResultActivity.class); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); - intent.putExtra("statusId", statusId); + intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); intent.putExtra("eorc", eorc); @@ -283,7 +283,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - statusId = beans.get(position).getId(); + caseState = beans.get(position).getValue(); caseStatusView.setText(tag); caseStatusView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index bc7082e..19f11e9 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -191,7 +191,7 @@ Observable obtainCaseList(@Header("token") String token, @Query("casetypeCode") String casetypeCode, @Query("casetypeDetailCode") String casetypeDetailCode, - @Query("caseStateId") String caseStateId, + @Query("caseState") String caseState, @Query("createTimeBegin") String createTimeBegin, @Query("createTimeEnd") String createTimeEnd, @Query("eorc") String eorc, diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java index 918217a..61f297f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseListModelImpl.java @@ -24,9 +24,9 @@ } @Override - public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { - Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseStateId, + Observable observable = RetrofitServiceManager.getCaseListResult(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset); return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java index 3bad487..7215726 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseListModel.java @@ -3,6 +3,6 @@ import rx.Subscription; public interface ICaseListModel { - Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + Subscription sendRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java index 9c323dd..6fbac29 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseListPresenterImpl.java @@ -16,10 +16,10 @@ } @Override - public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + public void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseStateId, + addSubscription(actionModel.sendRetrofitRequest(casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, offset)); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java index 142267a..fcdd09f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListPresenter.java @@ -1,7 +1,7 @@ package com.casic.dcms.mvp.presenter; public interface ICaseListPresenter { - void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseStateId, + void onReadyRetrofitRequest(String casetypeCode, String casetypeDetailCode, String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset); void disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index eb3e3e1..703d1b1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -48,7 +48,7 @@ private CaseListResultAdapter adapter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String startTime; private String endTime; private String eorc; @@ -88,12 +88,12 @@ weakReferenceHandler = new WeakReferenceHandler(this); typeCode = getIntent().getStringExtra("typeCode"); typeDetailCode = getIntent().getStringExtra("typeDetailCode"); - statusId = getIntent().getStringExtra("statusId"); + caseState = getIntent().getStringExtra("caseState"); startTime = getIntent().getStringExtra("startTime"); endTime = getIntent().getStringExtra("endTime"); eorc = getIntent().getStringExtra("eorc"); //加载第一页 - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } @@ -105,7 +105,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); @@ -114,7 +114,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, statusId, startTime, + caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, endTime, eorc, pageIndex); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 30762e9..a28c249 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -65,7 +65,7 @@ private CaseStatusPresenterImpl caseStatusPresenter; private String typeCode; private String typeDetailCode; - private String statusId; + private String caseState; private String eorc; @Override @@ -206,7 +206,7 @@ Intent intent = new Intent(this, CaseListResultActivity.class); intent.putExtra("typeCode", typeCode); intent.putExtra("typeDetailCode", typeDetailCode); - intent.putExtra("statusId", statusId); + intent.putExtra("caseState", caseState); intent.putExtra("startTime", startTimeView.getText().toString()); intent.putExtra("endTime", endTimeView.getText().toString()); intent.putExtra("eorc", eorc); @@ -283,7 +283,7 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - statusId = beans.get(position).getId(); + caseState = beans.get(position).getValue(); caseStatusView.setText(tag); caseStatusView.setTextColor(ColorHelper.getResourcesColor(context, R.color.textColor)); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index bc7082e..19f11e9 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -191,7 +191,7 @@ Observable obtainCaseList(@Header("token") String token, @Query("casetypeCode") String casetypeCode, @Query("casetypeDetailCode") String casetypeDetailCode, - @Query("caseStateId") String caseStateId, + @Query("caseState") String caseState, @Query("createTimeBegin") String createTimeBegin, @Query("createTimeEnd") String createTimeEnd, @Query("eorc") String eorc, diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 5f51822..66fd24c 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -209,11 +209,11 @@ * 根据时间查询案卷列表 */ public static Observable getCaseListResult(String casetypeCode, String casetypeDetailCode, - String caseStateId, String registerTimeBegin, + String caseState, String registerTimeBegin, String registerTimeEnd, String eorc, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseList(AuthenticationHelper.getToken(), casetypeCode, casetypeDetailCode, caseStateId, + return service.obtainCaseList(AuthenticationHelper.getToken(), casetypeCode, casetypeDetailCode, caseState, registerTimeBegin, registerTimeEnd, eorc, 15, offset); }