Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -484,7 +484,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         LogUtil.d("result:" + result);
                         LogUtil.d(formidkey);
                         success = JSON.parseObject(result).getBoolean("success");
-                        va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        if ("ExtraWork$".equals(caller)){
+                            va_id = JSON.parseObject(result).getIntValue("wod_id");
+                        }else{
+                            va_id = JSON.parseObject(result).getIntValue(formidkey);
+                        }
                         if (success) {
 
                             judgeApprovers(va_id);
@@ -2115,7 +2119,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         click_btn.setEnabled(false);
-        String url = Constants.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
+        String url =null;
+        if ("ExtraWork$".equals(caller)){
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
+        }else{
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
+        }
         Map<String, Object> params = new HashMap<>();
         params.put("caller", caller);
         params.put("formStore", formStore);
@@ -2323,10 +2332,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         btn_update.setEnabled(false);
-        String url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
+
+        String url =null;
         Map<String, Object> params = new HashMap<>();
+        if ("ExtraWork$".equals(caller)){
+            url = Constants.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkUpdateAndSubmit.action";
+            params.put("id", String.valueOf(formid));
+        }else{
+            url = Constants.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
+            params.put("keyid", String.valueOf(formid));
+        }
         params.put("caller", caller);
-        params.put("keyid", String.valueOf(formid));
         params.put("formStore", formStore);
         params.put("gridStore", gridStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();