From 0c0e5536ce0f69d2bcd7816ff4c49d1f162db07b Mon Sep 17 00:00:00 2001 From: "283591387@qq.com" Date: Sat, 18 May 2024 15:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8oracle=E6=95=B0=E6=8D=AE=E5=BA=93NUMBER?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Core/Partial/Sys_TableInfoService.cs | 4 ++-- .../Services/Core/Partial/Sys_TableInfoService.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index 680d5b30..5b0d91ef 100644 --- a/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -235,7 +235,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'nvarchar' @@ -1088,7 +1088,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'string' diff --git a/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs b/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs index 680d5b30..d703b47c 100644 --- a/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs +++ b/开发版dev/Net6开发版/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs @@ -235,7 +235,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'nvarchar' @@ -1088,7 +1088,7 @@ DISTINCT c.TABLE_NAME TableName , cc.COLUMN_NAME COLUMNNAME, cc.COMMENTS as ColumnCNName, - CASE WHEN c.DATA_TYPE IN('smallint', 'INT') THEN 'int' + CASE WHEN c.DATA_TYPE IN('smallint', 'INT') or (c.DATA_TYPE='NUMBER' and c.DATA_LENGTH=0) THEN 'int' WHEN c.DATA_TYPE IN('NUMBER') THEN 'decimal' WHEN c.DATA_TYPE IN('CHAR', 'VARCHAR', 'NVARCHAR','VARCHAR2', 'NVARCHAR2','text', 'image') THEN 'string' @@ -1850,7 +1850,7 @@ DISTINCT if ((column.IsKey == 1 && (column.ColumnType == "uniqueidentifier")) || column.ColumnType == "guid" - || ((IsMysql() || IsDM()|| IsOracle()) && column.ColumnType == "string" && column.Maxlength == 36)) + || ((IsMysql() || IsDM() || IsOracle()) && column.ColumnType == "string" && column.Maxlength == 36)) { columnType = "Guid" + (column.IsNull == 1 ? "?" : ""); }