feat:新增审批默认字段

zkqy-datamodeling/src/main/java/com/zkqy/datamodeling/service/impl/TableInfoServiceImpl.java

@@ -50,10 +50,10 @@ public class TableInfoServiceImpl implements ITableInfoService {
         String tableComment = (String) map.get("tableComment");
         List<TableInfo> filedList = JSON.parseArray(JSON.toJSONString(map.get("field")), TableInfo.class);
         List<String> list = filedList.stream().map(filed -> {
-            if(filed.getFieldName().equals("remark") || filed.getFieldName().equals("create_by_id") || filed.getFieldName().equals("create_by")
-            || filed.getFieldName().equals("create_time") || filed.getFieldName().equals("update_by_id") || filed.getFieldName().equals("update_by")
-            || filed.getFieldName().equals("update_time") || filed.getFieldName().equals("del_flag") || filed.getFieldName().equals("task_process_key")
-                    || filed.getFieldName().equals("task_node_key")){
+            if (filed.getFieldName().equals("remark") || filed.getFieldName().equals("create_by_id") || filed.getFieldName().equals("create_by")
+                    || filed.getFieldName().equals("create_time") || filed.getFieldName().equals("update_by_id") || filed.getFieldName().equals("update_by")
+                    || filed.getFieldName().equals("update_time") || filed.getFieldName().equals("del_flag") || filed.getFieldName().equals("task_process_key")
+                    || filed.getFieldName().equals("task_node_key")) {
                 return null;
             }
             StringBuilder stringBuilder = new StringBuilder();
@@ -72,6 +72,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             return stringBuilder.toString();
         }).collect(Collectors.toList());
         //添加默认字段
+        list.add("data_approval_status char(1) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '数据条审批状态（默认字段 0:未提交 1:已提交 2:已撤销 3:已通过）'");
         list.add("remark varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '备注'");
         list.add("create_by_id BIGINT(20) NULL DEFAULT NULL COMMENT '创建者id'");
         list.add("create_by varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '创建者'");
@@ -109,6 +110,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             return stringBuilder.toString();
         }).collect(Collectors.toList());
         //添加默认字段
+        list.add("data_approval_status char(1)");
         list.add("remark varchar(64)");
         list.add("create_by varchar(64)");
         list.add("create_time datetime");
@@ -126,12 +128,13 @@ public class TableInfoServiceImpl implements ITableInfoService {
                         .append(", N'column', N")
                         .append("'" + filed.getFieldName() + "'");
             }
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','备注', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'remark'");
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','创建者', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'create_by'");
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','创建时间', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'create_time'");
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','更新者', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'update_by'");
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','更新时间', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'update_time'");
-            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','删除标志（0代表存在 2代表删除）', N'user', N'dbo', N'table', N'"+tableName + "', N'column', N'del_flag'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','数据条审批状态（默认字段 0:未提交 1:已提交 2:已撤销 3:已通过）', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'data_approval_status'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','备注', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'remark'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','创建者', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'create_by'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','创建时间', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'create_time'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','更新者', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'update_by'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','更新时间', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'update_time'");
+            stringBuilder.append("EXECUTE sp_addextendedproperty N'MS_Description','删除标志（0代表存在 2代表删除）', N'user', N'dbo', N'table', N'" + tableName + "', N'column', N'del_flag'");
 
             return stringBuilder.toString();
         }).collect(Collectors.toList());
@@ -231,7 +234,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             if (tableInfoMapper.selectDataCount(tableName) > 0) {
                 return AjaxResult.warn("表中有数据,不能删除!");
             }
-            tableInfoMapper.dropMysqlTable(databaseName,tableName);
+            tableInfoMapper.dropMysqlTable(databaseName, tableName);
             return AjaxResult.success();
         } else if (databaseType.equals(DataSourceType.SQLSERVER.getDataSourceName())) {
             if (tableInfoMapper.selectSqlServerDataCount(tableName) > 0) {
@@ -251,7 +254,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
         if (tableInfoMapper.selectDataCount(tableName) > 0) {
             return AjaxResult.warn("表中有数据,不能删除!");
         }
-        tableInfoMapper.dropMysqlTable(databaseName,tableName);
+        tableInfoMapper.dropMysqlTable(databaseName, tableName);
         return AjaxResult.success();
     }
 
@@ -376,7 +379,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
         try {
 //            tableInfoMapper.updateMysqlTable(databaseName, tableName, tableComment, list);
             //delete table
-            tableInfoMapper.dropMysqlTable(databaseName,tableName);
+            tableInfoMapper.dropMysqlTable(databaseName, tableName);
             //create table
             createMysqlTable(map);
 
@@ -448,7 +451,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
         try {
             // 新增表
             tableInfoMapper.updateSqlserverTable(tableName, list, descriptionList, tableComment);
-        }catch (Exception e){
+        } catch (Exception e) {
             List<String> list1 = tableInfoList.stream().map(filed -> {
                 StringBuilder stringBuilder = new StringBuilder();
                 stringBuilder.append(filed.getFieldName() + " ")
@@ -525,6 +528,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             return stringBuilder.toString();
         }).collect(Collectors.toList());
         //添加默认字段
+        list.add("data_approval_status char(1)");
         list.add("remark varchar(64)");
         list.add("create_by varchar(64)");
         list.add("create_time datetime");
@@ -532,12 +536,13 @@ public class TableInfoServiceImpl implements ITableInfoService {
         list.add("update_time datetime");
         list.add("del_flag char(1)");
         //默认字段注释
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"remark\" is '备注'");
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"create_by\" is '创建者'");
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"create_time\" is '创建时间'");
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"update_by\" is '更新者'");
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"update_time\" is '更新时间'");
-        descriptionList.add("COMMENT ON COLUMN " + "\""+databaseName+"\"."+"\""+tableName+"\"."+"\"del_flag\" is '删除标志（0代表存在 2代表删除）'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"data_approval_status\" is '数据条审批状态（默认字段 0:未提交 1:已提交 2:已撤销 3:已通过）'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"remark\" is '备注'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"create_by\" is '创建者'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"create_time\" is '创建时间'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"update_by\" is '更新者'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"update_time\" is '更新时间'");
+        descriptionList.add("COMMENT ON COLUMN " + "\"" + databaseName + "\"." + "\"" + tableName + "\"." + "\"del_flag\" is '删除标志（0代表存在 2代表删除）'");
 
 
         tableInfoMapper.createDmTable(databaseName, tableName, list);
@@ -593,7 +598,7 @@ public class TableInfoServiceImpl implements ITableInfoService {
             descriptionList.stream().forEach(f -> tableInfoMapper.addTableDescription(f));
             //添加表注释
             tableInfoMapper.addDmTableComment(databaseName, tableName, tableComment);
-        }catch (Exception e){
+        } catch (Exception e) {
             List<String> descriptionList1 = new ArrayList<>();
             List<String> list1 = tableInfoList.stream().map(filed -> {
                 StringBuilder stringBuilder = new StringBuilder();
@@ -632,7 +637,6 @@ public class TableInfoServiceImpl implements ITableInfoService {
         }
 
 
-
     }
 
     @Override