提交和反提交

boman-modules/boman-system/src/main/java/com/boman/system/common/FormDataConstant.java

@@ -101,7 +101,7 @@ public class FormDataConstant {
 
 
     /**  状态 */
-    public static final String STATUS = "STATUS";
+    public static final String STATUS = "status";
 
 
 

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -310,49 +310,49 @@ public class TableServiceCmdService {
         List<JSONObject> beforeList = selectService.selectByIdList(tableName, pkName, idList, showData);
         requireNonNull(beforeList);
 
-        // 符合条件的需要提交的
-        List<JSONObject> needCommitList = Lists.newArrayListWithCapacity(16);
-        // 不符合条件的需要提交的
-        List<JSONObject> notNeedCommitList = Lists.newArrayListWithCapacity(16);
-        Iterator<JSONObject> iterator = beforeList.iterator();
-        while (iterator.hasNext()){
-            JSONObject next = iterator.next();
-            String dbStatus = next.getString(FormDataConstant.STATUS);
+        for (JSONObject commitDatum : commitData) {
+            String dbStatus = getStatusFromFormData(commitDatum, beforeList);
             // 只能是未提交的状态下，才能调用提交
             if (isSubmit) {
+                // 只能是未提交的状态下，才能调用提交, 下面是不允许
                 if (!SubmitConstant.NOT_SUBMIT.equals(dbStatus)) {
-                    next.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
-                    notNeedCommitList.add(next);
-                    iterator.remove();
+                    commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
                 } else {
-                    needCommitList.add(next);
+                    commitDatum.put(SubmitConstant.SUBMIT_USERID, 123);
+                    commitDatum.put(SubmitConstant.SUBMIT_TIME, new Timestamp(System.currentTimeMillis()));
+                    int effective = submitService.handlerSubmit(tableName, pkName, commitDatum, commitDatum.getLong(FormDataConstant.ID));
+                    if (effective > 0) {
+                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
+                    } else {
+                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
+                    }
                 }
             } else {
-                // 只有在已提交的情况下才能反提交
+                // 只有在已提交的情况下才能反提交, 下面是不允许
                 if (!SubmitConstant.SUBMITTED.equals(dbStatus)) {
-                    next.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
-                    notNeedCommitList.add(next);
-                    iterator.remove();
+                    commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.NOT_ALLOWED);
                 } else {
-                    needCommitList.add(next);
+                    commitDatum.put(SubmitConstant.SUBMIT_USERID, 123);
+                    commitDatum.put(SubmitConstant.SUBMIT_TIME, new Timestamp(System.currentTimeMillis()));
+                    int effective = submitService.handlerSubmit(tableName, pkName, commitDatum, commitDatum.getLong(FormDataConstant.ID));
+                    if (effective > 0) {
+                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
+                    } else {
+                        commitDatum.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
+                    }
                 }
             }
         }
+        return AjaxResult.success(commitData);
+    }
 
-        for (JSONObject jsonObject : needCommitList) {
-            jsonObject.put(SubmitConstant.SUBMIT_USERID, SecurityUtils.getUserId());
-            jsonObject.put(SubmitConstant.SUBMIT_TIME, new Timestamp(System.currentTimeMillis()));
-//            jsonObject.put(SubmitConstant.REMARK, "unknown");
-            int effective = submitService.handlerSubmit(tableName, pkName, jsonObject, jsonObject.getLong(FormDataConstant.ID));
-            if (effective > 0) {
-                jsonObject.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.SUCCESS);
-            } else {
-                jsonObject.put(SubmitConstant.SUBMIT_RESULT, SubmitConstant.FAIL);
+    private String getStatusFromFormData(JSONObject next, List<JSONObject> commitData) {
+        for (JSONObject jsonObject : commitData) {
+            if (jsonObject.getLong(FormDataConstant.ID).equals(next.getLong(FormDataConstant.ID))) {
+                return jsonObject.getString(FormDataConstant.STATUS);
             }
         }
-
-        needCommitList.addAll(notNeedCommitList);
-        return AjaxResult.success(needCommitList);
+        throw new IllegalArgumentException("不可能没有一个合适的");
     }