修改创建机构选人员筛选流程

BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -25,6 +25,7 @@ import com.cooleshow.base.widgets.span.QMUIAlignMiddleImageSpan;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -286,7 +287,7 @@ public class UiUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return price ;
+        return price;
     }
 
     public static String getLiveCoursePriceTextForStu(String lessonPrice) {
@@ -346,4 +347,18 @@ public class UiUtils {
         }
 
     }
+
+    public static String formatIdParams(ArrayList<String> list) {
+        if (list == null || list.size() == 0) {
+            return "";
+        }
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < list.size(); i++) {
+            stringBuilder.append(list.get(i));
+            if (i != list.size() - 1) {
+                stringBuilder.append(",");
+            }
+        }
+        return stringBuilder.toString();
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/adapter/SelectTenantMemberFilterAdapter.java

@@ -40,6 +40,8 @@ public class SelectTenantMemberFilterAdapter extends BaseQuickAdapter<ICommonFil
         if (isContain(id)) {
             selectIds.remove(id);
         } else {
+            //单选 去掉clear即为多选
+            selectIds.clear();
             selectIds.add(id);
         }
         notifyDataSetChanged();

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/SelectTenantMemberPresenter.java

@@ -1,5 +1,7 @@
 package com.cooleshow.teacher.presenter.mine;
 
+import android.text.TextUtils;
+
 import com.cooleshow.base.bean.SubjectListBean;
 import com.cooleshow.base.bean.TenantGroupListBean;
 import com.cooleshow.base.presenter.BasePresenter;
@@ -19,13 +21,15 @@ import org.json.JSONObject;
  * 类说明：
  */
 public class SelectTenantMemberPresenter extends BasePresenter<SelectTenantMemberContract.SelectTenantView> implements SelectTenantMemberContract.Presenter {
-    public void getTenantStudentList() {
+    public void getTenantStudentList(String subjectId, String groupId) {
         if (getView() != null) {
             getView().showLoading();
         }
         JSONObject jsonObject = new JSONObject();
         try {
             jsonObject.put("bindTenant", 1);
+            jsonObject.put("subjectId", subjectId);
+            jsonObject.put("tenantGroupId", groupId);
             jsonObject.put("page", 1);
             jsonObject.put("rows", Integer.MAX_VALUE);
         } catch (JSONException e) {
@@ -41,8 +45,8 @@ public class SelectTenantMemberPresenter extends BasePresenter<SelectTenantMembe
         });
     }
 
-    public void getSubjectList(){
-        addSubscribe(create(APIService.class).getSubjectList("list",1,Integer.MAX_VALUE), new BaseObserver<SubjectListBean>(getView()) {
+    public void getSubjectList() {
+        addSubscribe(create(APIService.class).getSubjectList("list", 1, Integer.MAX_VALUE), new BaseObserver<SubjectListBean>(getView()) {
             @Override
             protected void onSuccess(SubjectListBean data) {
                 if (getView() != null) {
@@ -52,11 +56,11 @@ public class SelectTenantMemberPresenter extends BasePresenter<SelectTenantMembe
         });
     }
 
-    public void getTenantGroupList(){
-        JSONObject jsonObject =new JSONObject();
+    public void getTenantGroupList() {
+        JSONObject jsonObject = new JSONObject();
         try {
-            jsonObject.put("page",1);
-            jsonObject.put("rows",Integer.MAX_VALUE);
+            jsonObject.put("page", 1);
+            jsonObject.put("rows", Integer.MAX_VALUE);
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SelectTenantMemberActivity.java

@@ -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();
         }