优化代码

java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java

@@ -7,27 +7,18 @@ import com.java110.utils.util.StringUtil;
 public class TableToJsonWeb {
 
     //show create table c_orders  用这个语句获取
-    public static final String createTableSql = "CREATE TABLE `coupon_detail` (\n" +
-            "  `detail_id` varchar(30) NOT NULL COMMENT '记录ID',\n" +
-            "  `pool_id` varchar(30) NOT NULL COMMENT '优惠券',\n" +
-            "  `shop_id` varchar(30) NOT NULL COMMENT '店铺ID',\n" +
-            "  `coupon_name` varchar(64) NOT NULL COMMENT '优惠券名称',\n" +
-            "  `actual_price` decimal(10,2) NOT NULL COMMENT '面值',\n" +
-            "  `buy_price` decimal(10,2) NOT NULL COMMENT '购买价格',\n" +
-            "  `amount` decimal(10,2) NOT NULL COMMENT '付款金额',\n" +
-            "  `buy_count` bigint(20) NOT NULL COMMENT '购买数量',\n" +
-            "  `validity_day` bigint(20) NOT NULL COMMENT '有效期',\n" +
-            "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n" +
-            "  `status_cd` varchar(2) NOT NULL DEFAULT '0' COMMENT '数据状态，详细参考c_status表，S 保存，0, 在用 1失效',\n" +
-            "  PRIMARY KEY (`detail_id`)\n" +
+    public static final String createTableSql = "CREATE TABLE business_dockerfile(\n" +
+            "    `id` varchar(64)  NOT NULL comment '编号',\n" +
+            "    `name` varchar(64) NOT NULL comment '名称',\n" +
+            "    `dockerfile` varchar(10000) NOT NULL comment '内容'\n" +
             ")";
     public static void main(String[] args) {
-        String templateName = "商家购买记录表"; //业务名称
-        String templateCode = "couponDetail"; //表名大写
-        String templateKey = "detailId"; //表主键
-        String templateKeyName = "商家购买记录表ID";//主键说明
-        String searchCode = "detailId"; //分片字段
-        String searchName = "商家购买记录表ID"; //分片字段说明
+        String templateName = "mydockerfile"; //业务名称
+        String templateCode = "businessDockerfile"; //表名大写
+        String templateKey = "id"; //表主键
+        String templateKeyName = "编号";//主键说明
+        String searchCode = "id"; //分片字段
+        String searchName = "编号"; //分片字段说明
         String directories = "admin"; //前端生成到那个目录下
         // templateName 业务名称 业务编码名称生成后文件名 templateCode 主键 templateKey
         // 业务主键名称 templateKeyName=templateName+ID 主机驼峰 searchCode 主键名称 searchName

java110-generator/src/main/resources/web/template_1.json

@@ -1,151 +1,55 @@
 {
-  "templateKeyName": "商家购买记录表ID",
-  "templateName": "商家购买记录表",
+  "templateKeyName": "编号",
+  "templateName": "mydockerfile",
   "columns": [
-    {
-      "hasDefaultValue": false,
-      "limitParam": "30",
-      "code": "detailId",
-      "limitErrInfo": "记录ID不能超过30",
-      "cnCode": "记录ID",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，记录ID"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "30",
-      "code": "poolId",
-      "limitErrInfo": "优惠券不能超过30",
-      "cnCode": "优惠券",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，优惠券"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "30",
-      "code": "shopId",
-      "limitErrInfo": "店铺ID不能超过30",
-      "cnCode": "店铺ID",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，店铺ID"
-    },
     {
       "hasDefaultValue": false,
       "limitParam": "64",
-      "code": "couponName",
-      "limitErrInfo": "优惠券名称不能超过64",
-      "cnCode": "优惠券名称",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，优惠券名称"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "10",
-      "code": "actualPrice",
-      "limitErrInfo": "面值不能超过10",
-      "cnCode": "面值",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，面值"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "10",
-      "code": "buyPrice",
-      "limitErrInfo": "购买价格不能超过10",
-      "cnCode": "购买价格",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，购买价格"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "10",
-      "code": "amount",
-      "limitErrInfo": "付款金额不能超过10",
-      "cnCode": "付款金额",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，付款金额"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "20",
-      "code": "buyCount",
-      "limitErrInfo": "购买数量不能超过20",
-      "cnCode": "购买数量",
-      "limit": "maxLength",
-      "show": true,
-      "inputType": "input",
-      "required": true,
-      "desc": "必填，购买数量"
-    },
-    {
-      "hasDefaultValue": false,
-      "limitParam": "20",
-      "code": "validityDay",
-      "limitErrInfo": "有效期不能超过20",
-      "cnCode": "有效期",
+      "code": "name",
+      "limitErrInfo": "名称不能超过64",
+      "cnCode": "名称",
       "limit": "maxLength",
       "show": true,
       "inputType": "input",
       "required": true,
-      "desc": "必填，有效期"
+      "desc": "必填，name"
     },
     {
       "hasDefaultValue": false,
-      "limitParam": "`detail_id`",
-      "code": "primary",
-      "limitErrInfo": "primary不能超过`detail_id`",
-      "cnCode": "primary",
+      "limitParam": "10000",
+      "code": "dockerfile",
+      "limitErrInfo": "内容不能超过10000",
+      "cnCode": "内容",
       "limit": "maxLength",
       "show": true,
       "inputType": "input",
       "required": true,
-      "desc": "primary"
+      "desc": "必填，dockerfile"
     }
   ],
-  "searchName": "商家购买记录表ID",
+  "searchName": "编号",
   "directories": "admin",
-  "searchCode": "detailId",
-  "templateCode": "couponDetail",
+  "searchCode": "id",
+  "templateCode": "businessDockerfile",
   "conditions": [
     {
       "whereCondition": "equal",
-      "code": "poolId",
-      "name": "优惠券",
+      "code": "id",
+      "name": "编号",
       "inputType": "input"
     },
     {
       "whereCondition": "equal",
-      "code": "shopId",
-      "name": "店铺ID",
+      "code": "name",
+      "name": "名称",
       "inputType": "input"
     },
     {
       "whereCondition": "equal",
-      "code": "validityDay",
-      "name": "有效期",
+      "code": "id1",
+      "name": "id1",
       "inputType": "input"
     }
   ],
-  "templateKey": "detailId"
-}
+  "templateKey": "id"
+}

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -289,6 +289,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         sql.append("store_id varchar(30) not null COMMENT '商户ID',");
         sql.append("create_user_id varchar(30) not null COMMENT '创建人ID',");
         sql.append("create_user_name varchar(64) not null COMMENT '创建人',");
+        sql.append("file varchar(512)  COMMENT '附件地址',");
         sql.append("state varchar(12) not null COMMENT '状态 1001 申请 1002 待审核 1003 退回 1004 委托 1005 办结',");
         sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',");
         sql.append("status_cd varchar(2) NOT NULL DEFAULT '0' COMMENT '数据状态，详细参考c_status表，S 保存，0, 在用 1失效'");

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -381,6 +381,7 @@ public class OaWorkflowApi {
             if ("flowId".equals(key)) {
                 continue;
             }
+
             columns.add(key);
             values.add(reqJson.getString(key));
         }