1.用户反馈列表,新增客户跳转

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java

@@ -10,8 +10,10 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -46,7 +48,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
     private Map<String, Object> param;
-    private List<ClientBean.RecordsBean> clientList;
+    private List<MesClientBean.ListBean> clientList;
     private UserDataClientAdapter clientAdapter;
     private int page = 1;
 
@@ -59,24 +61,16 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         clientList = new ArrayList<>();
-        clientList.add(null);
-        clientList.add(null);
-        clientList.add(null);
         clientAdapter = new UserDataClientAdapter(R.layout.item_user_data_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
-        param = WorkUtils.pageKey();
-//        getData();
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        getData();
     }
 
     private void getData() {
-        Observable<BaseBean> observable;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            observable = RtfUtils.getRtf().getClient(param);
-        } else {
-            observable = RtfUtils.getRtf().getClientOut(param);
-        }
-        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().clientList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -88,40 +82,27 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     return;
                 }
-                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
-                    dataList.addAll(clientBean.getRecords());
-                    if (page == 1) {
-                        clientList.clear();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                        clientAdapter.loadMoreComplete();
-                    } else {
-                        clientAdapter.loadMoreComplete();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                    }
-                    if (dataList.size() == 0) {
-                        clientAdapter.loadMoreEnd();
-                    } else {
-                        page++;
-                    }
-                } else {
-                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
-                    clientAdapter.loadMoreEnd();
+                List<MesClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesClientBean.class).getList();
+                if (page == 1) {
                     clientList.clear();
-                    clientList.addAll(dataList);
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
                     clientAdapter.notifyDataSetChanged();
                 }
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
                 }
                 toast("搜索成功");
             }
@@ -133,8 +114,8 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
         clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override
             public void onLoadMoreRequested() {
-                param.put("current", page);
-//                getData();
+                param.put("pageNum", page);
+                getData();
             }
         }, rvClient);
         clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -158,8 +139,8 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
         param.put("name", etKey.getText().toString());
-        param.put("current", 1);
+        param.put("pageNum", 1);
         page = 1;
-//        getData();
+        getData();
     }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java

@@ -42,37 +42,6 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        getData();
-    }
-
-    private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
-
-
-            @Override
-            public void doOnSubscribe(Disposable d) {
-            }
-
-            @Override
-            public void onFail(String errorMsg) {
-                hideLoading();
-                toast(errorMsg);
-            }
-
-            @Override
-            public void onSuccess(BaseBean data) {
-                hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
-                    return;
-                }
-                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
-//                tvName.setText(dataBean.getName());
-//                tvDpeName.setText(dataBean.getName());
-//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
-//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
-            }
-        });
     }
 
     @Override
@@ -103,7 +72,8 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.rl_client)
     public void onViewClicked() {
-        startActivityForResult(MesChooseClientActivity.class, 10001);
+//        startActivityForResult(MesChooseClientActivity.class, 10001);
+        startActivity(MesChooseClientActivity.class);
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java

@@ -18,6 +18,8 @@ import com.wd.workoffice.bean.listener.FiveMenuClickListener;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 import com.wd.workoffice.util.WorkUtils;
@@ -59,7 +61,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         tvGo.setText("市场服务\n" +
                 "审核");
     }
@@ -157,11 +159,16 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
         return super.onOptionsItemSelected(item);
     }
 
-
-    @OnClick(R.id.tv_go)
-    public void onViewClicked() {
-        startActivity(MesUserDataListCheckActivity.class);
-        finish();
+    @OnClick({R.id.tv_go, R.id.btn_add})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_go:
+                startActivity(MesUserDataListCheckActivity.class);
+                finish();
+                break;
+            case R.id.btn_add:
+                startActivity(MesUserDataAddActivity.class);
+                break;
+        }
     }
-
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java

@@ -15,6 +15,8 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 import com.wd.workoffice.util.WorkUtils;
@@ -55,7 +57,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         tvGo.setText("任务担当\n" +
                 "页面");
     }
@@ -154,10 +156,16 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick(R.id.tv_go)
-    public void onViewClicked() {
-        startActivity(MesUserDataListActivity.class);
-        finish();
+    @OnClick({R.id.tv_go, R.id.btn_add})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_go:
+                startActivity(MesUserDataListActivity.class);
+                finish();
+                break;
+            case R.id.btn_add:
+                startActivity(MesUserDataAddActivity.class);
+                break;
+        }
     }
-
 }

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataClientAdapter.java

@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ClientBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
 
 import java.util.List;
 
@@ -12,13 +13,17 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class UserDataClientAdapter extends BaseQuickAdapter<ClientBean.RecordsBean, BaseViewHolder> {
+public class UserDataClientAdapter extends BaseQuickAdapter<MesClientBean.ListBean, BaseViewHolder> {
     public UserDataClientAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, ClientBean.RecordsBean item) {
+    protected void convert(BaseViewHolder helper, MesClientBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getCustomerName());
+        helper.setText(R.id.tv_person, item.getSalesCompanyName());
+        helper.setText(R.id.tv_sale, item.getSalesManagerName());
+
     }
 }
 

app/src/main/res/layout/item_user_data_client.xml

@@ -15,6 +15,7 @@
         android:textSize="16sp" />
 
     <TextView
+        android:id="@+id/tv_sale"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -23,6 +24,7 @@
         android:textSize="16sp" />
 
     <TextView
+        android:id="@+id/tv_person"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"