|
@@ -16,6 +16,7 @@ import com.cooleshow.base.router.RouterPath;
|
|
|
import com.cooleshow.base.ui.activity.BaseMVPActivity;
|
|
|
import com.cooleshow.base.utils.SizeUtils;
|
|
|
import com.cooleshow.base.utils.ToastUtil;
|
|
|
+import com.cooleshow.base.utils.UiUtils;
|
|
|
import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
|
|
|
import com.cooleshow.base.widgets.CommonBottomItemDecoration;
|
|
|
import com.cooleshow.base.widgets.CustomSuspensionDecoration;
|
|
@@ -53,6 +54,8 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
|
|
|
private ArrayList<SubjectListBean.RowsBean> subjectList;
|
|
|
private ArrayList<TenantGroupListBean.RowsBean> groupList;
|
|
|
private SelectTenantMemberFilterBottomDialog mFilterDialog;
|
|
|
+ private String subjectId;
|
|
|
+ private String tenantGroupId;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -108,12 +111,12 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
|
|
|
}
|
|
|
|
|
|
private void getData() {
|
|
|
- presenter.getTenantStudentList();
|
|
|
+ presenter.getTenantStudentList(subjectId, tenantGroupId);
|
|
|
}
|
|
|
|
|
|
private void showFilterDialog() {
|
|
|
if (subjectList == null) {
|
|
|
- presenter.getTenantStudentList();
|
|
|
+ presenter.getSubjectList();
|
|
|
return;
|
|
|
}
|
|
|
if (groupList == null) {
|
|
@@ -125,16 +128,9 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
|
|
|
mFilterDialog.setOnEventListener(new SelectTenantMemberFilterBottomDialog.OnEventListener() {
|
|
|
@Override
|
|
|
public void onCheckResult(ArrayList<String> subjectIds, ArrayList<String> groupList) {
|
|
|
- ArrayList<StudentPageListBean.RowsBean> bySubjectId = findBySubjectId(subjectIds);
|
|
|
- ArrayList<StudentPageListBean.RowsBean> byGroupId = findByGroupId(groupList);
|
|
|
- ArrayList<StudentPageListBean.RowsBean> result = new ArrayList<>();
|
|
|
- if (bySubjectId != null) {
|
|
|
- result.addAll(bySubjectId);
|
|
|
- }
|
|
|
- if (byGroupId != null) {
|
|
|
- result.addAll(byGroupId);
|
|
|
- }
|
|
|
- mMemberAdapter.addSelects(result);
|
|
|
+ subjectId = UiUtils.formatIdParams(subjectIds);
|
|
|
+ tenantGroupId = UiUtils.formatIdParams(groupList);
|
|
|
+ getData();
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -199,6 +195,7 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
|
|
|
.invalidate();
|
|
|
mMemberAdapter.setList(list);
|
|
|
} else {
|
|
|
+ mDecoration.setmDatas(null);
|
|
|
mMemberAdapter.getData().clear();
|
|
|
mMemberAdapter.notifyDataSetChanged();
|
|
|
}
|