抓取成功

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

@@ -144,10 +144,16 @@ public class DailydetailsActivity extends BaseActivity {
                                 Toast.makeText(ct, "工作日报删除成功", Toast.LENGTH_LONG).show();
 //                                    startActivity(new Intent(activity,WorkDailyShowActivity.class)
 //                                    .putExtra("fromwhere","delete_succeed"));
-                                Intent intent = new Intent();
-                                intent.putExtra("delete_succeed","");
-                                setResult(DELETE_SUCCEED,intent);
-                                DailydetailsActivity.this.finish();
+
+                                if (!TextUtils.isEmpty(fromwhere) && "submitdaily".equals(fromwhere)){
+                                    startActivity(new Intent(DailydetailsActivity.this,WorkDailyShowActivity.class));
+                                    finish();
+                                }else if (!TextUtils.isEmpty(fromwhere) && "dailylist".equals(fromwhere)){
+                                    Intent intent = new Intent();
+                                    intent.putExtra("delete_succeed","");
+                                    setResult(DELETE_SUCCEED,intent);
+                                    DailydetailsActivity.this.finish();
+                                }
                             }
                         }
                     }

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

@@ -66,15 +66,6 @@ public class WorkDailyAddActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-//                case 0x11:
-//                    imOk = true;
-//                    if (erpOk) {
-//                        setResult(0x22, new Intent());
-//                        isSbmit = false;
-//                        startActivity(new Intent(activity, WorkDailyShowActivity.class));
-//                        doGrabJobContent(mkeyValue);
-//                    }
-//                    break;
                 case DAILY_SUBMITTED_SUCCESSFULLY:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
@@ -83,7 +74,7 @@ public class WorkDailyAddActivity extends BaseActivity {
                             if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
                                 Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
                                 try {
-                                    mkeyValue= new JSONObject(result).getJSONObject("data").getInt("WD_ID");
+                                    mkeyValue= new JSONObject(result).getJSONArray("data").getJSONObject(0).getInt("WD_ID");
                                     Log.i("First_mkeyValue", mkeyValue + " ");
                                 } catch (JSONException e) {
                                     e.printStackTrace();
@@ -129,13 +120,19 @@ public class WorkDailyAddActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             String result = msg.getData().getString("result");
-                            LogUtil.prinlnLongMsg("LAST_SUBMIT_message", result);
-                            Toast.makeText(ct, "工作日报重新提交成功", Toast.LENGTH_SHORT).show();
-                            doGrabJobContent(mkeyValue);
-//                            startActivity(new Intent(activity,DailydetailsActivity.class)
-//                                    .putExtra("caller", "WorkDaily")
-//                                    .putExtra("ID",mkeyValue)
-//                                    .putExtra("resadd","resadd"));
+                            if (JSON.parseObject(result).containsKey("success") && JSON.parseObject(result).getBoolean("success")) {
+                                LogUtil.prinlnLongMsg("LAST_SUBMIT_message", result);
+                                Toast.makeText(ct, "工作日报重新提交成功", Toast.LENGTH_SHORT).show();
+                                try {
+                                    wd_context = new JSONObject(result).getJSONArray("data").getJSONObject(0).getString("WD_CONTEXT");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                doGrabJobContent(mkeyValue);
+                            } else {
+                                Crouton.makeText(ct, "工作日报重新提交失败");
+                            }
+
                         }
                     }
                     break;
@@ -165,6 +162,7 @@ public class WorkDailyAddActivity extends BaseActivity {
             }
         }
     };
+    private String wd_context;
 
     public void doGrabJobContent(int mkeyValue) {
         //跳转之前抓取工作内容
@@ -192,6 +190,7 @@ public class WorkDailyAddActivity extends BaseActivity {
         intent.putExtra("WD_Status", "已提交");
         intent.putExtra("Plan", add_plan.getText().toString());
         intent.putExtra("Experience", add_experience.getText().toString());
+        intent.putExtra("Donetask",wd_context);
         startActivity(intent);
         finish();
     }