多从表修改前备份

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillDetailsActivity.java

@@ -75,7 +75,7 @@ public class BillDetailsActivity extends OABaseActivity implements IBillDetails
                         @Override
                         public void result(boolean clickSure) {
                             if (clickSure) {
-                                mBillDetailsPresenter.unSubmit();
+                                mBillDetailsPresenter.unSubmit(status);
                             }
                         }
                     });

app_modular/apputils/src/main/java/com/modular/apputils/presenter/BillDetailsPresenter.java

@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -83,14 +84,25 @@ public class BillDetailsPresenter extends BaseNetPresenter {
         return mId;
     }
 
-    public void unSubmit() {
-        mIBillDetails.showLoading();
-        requestCompanyHttp(new Parameter.Builder()
-                        .url("mobile/commonres.action")
-                        .addParams("caller", mCaller)
-                        .addParams("id", mId)
-                        .record(UN_SUBMIT)
-                , mOnSmartHttpListener);
+    public void unSubmit(String status) {
+        LogUtil.i("gong","status="+status);
+        if (status!=null&&status.equals("在录入")){
+            ct.startActivity(new Intent(ct, mInputClass == null ? BillInputActivity.class : mInputClass)
+                    .putExtra(Constants.Intents.CALLER, mCaller)
+                    .putExtra(Constants.Intents.TITLE, ((BaseToolBarActivity) ct).getToolBarTitle())
+                    .putExtra(Constants.Intents.ID, mId)
+            );
+            mIBillDetails.finish();
+        }else{
+            mIBillDetails.showLoading();
+            requestCompanyHttp(new Parameter.Builder()
+                            .url("mobile/commonres.action")
+                            .addParams("caller", mCaller)
+                            .addParams("id", mId)
+                            .record(UN_SUBMIT)
+                    , mOnSmartHttpListener);
+        }
+
     }
 
     private void loadFormandGridDetail() {
@@ -193,8 +205,8 @@ public class BillDetailsPresenter extends BaseNetPresenter {
             mGroupModel.setDeleteAble(false);
             mGroupModel.setGroupIndex(0);
             mGroupModel.setGroup(" ");
-            handlerModelByObject(mGroupModel, formconfigs, formdata);
-            status = JSONUtil.getText(formdata, "cu_auditstatus");
+            String statusKey=   handlerModelByObject(mGroupModel, formconfigs, formdata);
+            status = JSONUtil.getText(formdata, "cu_auditstatus",statusKey);
             mBillGroupModels.add(mGroupModel);
         }
         JSONArray gridconfigs = JSONUtil.getJSONArray(datas, "gridconfigs");
@@ -218,7 +230,9 @@ public class BillDetailsPresenter extends BaseNetPresenter {
     }
 
 
-    private void handlerModelByObject(BillGroupModel mGroupModel, JSONArray configs, JSONObject object) {
+    private String handlerModelByObject(BillGroupModel mGroupModel, JSONArray configs, JSONObject object) {
+        String statusKey=null;
+
         for (int i = 0; i < configs.size(); i++) {
             JSONObject config = configs.getJSONObject(i);
             if (config == null) continue;
@@ -252,6 +266,9 @@ public class BillDetailsPresenter extends BaseNetPresenter {
                     }
                 }
             }
+            if (TextUtils.isEmpty(statusKey)&&("单据状态".equals(caption)||"状态".equals(caption))){
+                statusKey=field;
+            }
             if (!ListUtils.isEmpty(combostore)) {
                 List<BillGroupModel.LocalData> localDatas = new ArrayList<>();
                 for (int j = 0; j < combostore.size(); j++) {
@@ -274,5 +291,6 @@ public class BillDetailsPresenter extends BaseNetPresenter {
             }
 
         }
+        return statusKey;
     }
 }