login_name == null ??

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -92,7 +92,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 case http_commit:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
-                    Toast.makeText(mContext, "问题提交成功", Toast.LENGTH_LONG);
+                    Toast.makeText(getApplicationContext(), "问题提交成功", Toast.LENGTH_LONG);
                     finish();
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
@@ -164,11 +164,10 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 }
             }
         });
-//        if (!platform){
+        if (!platform){
             getCode();
-//        }else {
-//            getPlatCode();
-//        }
+        }
+
     }
     private void getCode() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";

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

@@ -189,7 +189,8 @@ public class TravelPageActivity extends BaseActivity implements RecognizerDialog
                             .putExtra("data", map.toJSONString())
                             .putExtra("detailJson", detail.toJSONString())
                             .putExtra("mkeyValue", root.getIntValue("fp_id"))
-                            .putExtra("submittype", "resubmit"));
+                            .putExtra("submittype", "resubmit")
+                            .putExtra("fpd_id",array.getJSONObject(0).getInteger("fpd_id")));
                     finish();
                 } else {
                     startActivityForResult(new Intent(ct, FormDetailActivity.class)

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

@@ -189,6 +189,7 @@ public class WorkPageActivity extends BaseActivity implements RecognizerDialogLi
                             .putExtra("detailJson", detail.toJSONString())
                             .putExtra("mkeyValue", root.getIntValue("wo_id"))
                             .putExtra("submittype", "resubmit")
+                            .putExtra("wod_id",array.getJSONObject(0).getInteger("wod_id"))
                             , 0x333);
 
                     finish();

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

@@ -253,9 +253,9 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
             }
 
             if (i == allList.size() -1){
-                LogUtil.prinlnLongMsg("waitList",waitList.toString());
-                LogUtil.prinlnLongMsg("doneList",doneList.toString());
-                LogUtil.prinlnLongMsg("isendList",isendList.toString());
+                LogUtil.prinlnLongMsg("waitList",JSON.toJSONString(waitList));
+                LogUtil.prinlnLongMsg("doneList",JSON.toJSONString(doneList));
+                LogUtil.prinlnLongMsg("isendList",JSON.toJSONString(isendList));
                 if (tab_type == 1){
                     adapter = new NewSchedultAdapter(TaskB2BActivity.this, waitList);
                     real_List = waitList;

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

@@ -277,7 +277,8 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
                             "}";
                     String gridStore = "{\n" +
                             "\"taskid\":\"" + taskId + "\",\n" +//单据id
-                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+//                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(this, "b2b_uu") + "\",\n" +//个人uu
+                            "\"replyman\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname") + "\",\n" +//个人名字
                             "\"Replytime\":\"" + DateFormatUtil.getFormatDate(System.currentTimeMillis()) + "\",\n" +
                             "\"Replydetail\":\"" + et_task_name.getText().toString().trim() + "\",\n" +//回复内容
                             "\"uu\":\"" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu() + "\"\n" +//企业uu enUU