From ae20cf72c940b6b26a0dd347a04e83b16d2f5270 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 24 八月 2021 21:52:56 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index e3c14ef..0864512 100755
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -216,10 +216,10 @@
Assert.listOnlyOne(oaWorkflowFormDtos, "鏈缃〃鍗�");
//鏌ヨ琛ㄦ槸鍚﹀瓨鍦�
- int count = oaWorkflowFormInnerServiceSMOImpl.hasTable(oaWorkflowFormDtos.get(0).getTableName());
- if (count > 0) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
- return;
- }
+// int count = oaWorkflowFormInnerServiceSMOImpl.hasTable(oaWorkflowFormDtos.get(0).getTableName());
+// if (count > 0) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
+// return;
+// }
String formJson = oaWorkflowFormDtos.get(0).getFormJson();
@@ -229,9 +229,10 @@
JSONArray components = form.getJSONArray("components");
JSONObject component = null;
- StringBuffer sql = new StringBuffer("create table ");
+ StringBuffer sql = new StringBuffer("create table if not exists ");
sql.append(oaWorkflowFormDtos.get(0).getTableName());
sql.append(" (");
+ sql.append("id varchar(30) NOT NULL PRIMARY KEY COMMENT '涓婚敭ID',");
boolean isVarchar = false;
JSONObject validate = null;
for (int componentIndex = 0; componentIndex < components.size(); componentIndex++) {
@@ -273,28 +274,35 @@
sql.append("(");
sql.append(validate.getIntValue("maxLength"));
sql.append(") ");
- } else if (isVarchar) {
+ }
+ if (isVarchar && !validate.containsKey("maxLength")) {
sql.append("(64) ");
}
if (validate.containsKey("required") && validate.getBoolean("required")) {
sql.append(" not null ");
}
}
+ if (!component.containsKey("validate") && isVarchar) {
+ sql.append("(64) ");
+ }
sql.append(" comment '");
sql.append(component.getString("label"));
- sql.append("'");
-
- if (componentIndex != components.size() - 1) {
- sql.append(",");
- }
+ sql.append("',");
}
- sql.append(" )");
+ sql.append("store_id varchar(30) not null COMMENT '鍟嗘埛ID',");
+ sql.append("create_user_id varchar(30) not null COMMENT '鍒涘缓浜篒D',");
+ sql.append("create_user_name varchar(64) not null COMMENT '鍒涘缓浜�',");
+ sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',");
+ sql.append("status_cd varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥'");
+ sql.append(")");
logger.debug("閮ㄧ讲琛ㄥ崟sql" + sql.toString());
- count = oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
- if (count < 1) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
- throw new IllegalArgumentException("閮ㄧ讲琛ㄥ崟澶辫触");
- }
+ oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
+
+// int count = oaWorkflowFormInnerServiceSMOImpl.createTable(sqlStr);
+// if (count < 1) { // 宸茬粡閮ㄧ讲杩囦笉鐢ㄥ啀閮ㄧ讲
+// throw new IllegalArgumentException("閮ㄧ讲琛ㄥ崟澶辫触");
+// }
}
@Override
--
Gitblit v1.8.0