已审批上拉加载处理前

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java

@@ -144,8 +144,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     break;
                 case SUSSCESS_already:
                     itemArray = JSON.parseObject(result).getJSONArray("data");
-                    if (page == 1)
-                        arrayRe.clear();
+                    if (page == 1) arrayRe.clear();
                     arrayRe.addAll(itemArray);
                     if (mAdapter == null) {
                         mAdapter = new ProcessAdapter(ct, arrayRe);
@@ -442,7 +441,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                 tv_process_un.setSelected(true);
                 tv_process_already.setSelected(false);
                 tv_process_me.setSelected(false);
-                mList.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+                mList.setMode(PullToRefreshBase.Mode.BOTH);
                 loadProcessToDo(page);
 
                 break;
@@ -488,13 +487,13 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     }
 
 
-    private void loadProcesstoAlreadyDo(int page) {
+    private void loadProcesstoAlreadyDo(int pageDone) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getAuditDone;
         Map<String, Object> params = new HashMap<>();
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu"));
         params.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "companyEnUu"));
         params.put("count", "1000");
-        params.put("page", page);
+        params.put("page", pageDone);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, SUSSCESS_already, null, null, "get");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java

@@ -32,6 +32,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -113,6 +114,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private CustomerScrollView csv_hide;
     @ViewInject(R.id.ly_head_display)
     private LinearLayout ly_head_display;
+    @ViewInject(R.id.common_docui_photo_img)
+    private ImageView photo_im;
+    @ViewInject(R.id.common_docui_name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.common_docui_Section_tv)
+    private TextView section_tv;
     private String date;
     private String summary;
     private String wd_status;
@@ -668,6 +675,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("doc_em_data", doc_em_data);
                         if (!StringUtils.isEmpty(doc_em_data)) {
                             getDailyStatue(doc_em_data);
+                            getapplypeomsg(doc_em_data);
                         }
                     }
                     break;
@@ -683,6 +691,17 @@ public class PlatWDdetailyActivity extends BaseActivity {
         }
     };
 
+    private void getapplypeomsg(String doc_em_data) {
+        JSONObject object = JSON.parseObject("doc_em_data");
+        JSONObject dataObject = object.getJSONObject("data");
+        Long em_code = dataObject.getLongValue("emcode");
+        String em_name = dataObject.getString("wd_emp");
+
+        name_tv.setText(em_name);
+        String imageUri = "drawable://" + R.drawable.common_header_boy;
+        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+    }
+
     private void getDailyStatue(String doc_em_data) {
         JSONObject Object = JSON.parseObject(doc_em_data);
         JSONObject dataObject = Object.getJSONObject("data");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/activity/ChangeDealManActivity.java

@@ -177,7 +177,9 @@ public class ChangeDealManActivity extends BaseActivity implements RecognizerDia
                         String change_deal_man_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("change_deal_man_result", change_deal_man_result);
                         Toast.makeText(getApplicationContext(), "变更成功", Toast.LENGTH_LONG).show();
-                        setResult(0x333);
+                        Intent intent  = new Intent();
+                        intent.putExtra("change",true);
+                        setResult(0x333,intent);
                         finish();
                     }
                     break;