diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index db9ff1f..ef1ff3d 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -94,7 +94,7 @@ namespace ZR.Admin.WebApi.Controllers //查询原表数据,部分字段映射到代码生成表字段 var rows = GenTableService.GetGenTables(new GenTable() { TableName = tableName }, pagerInfo); - return SUCCESS(rows); + return SUCCESS(rows, "MM月dd日 HH:mm"); } /// diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt index b779e2a..82e6efb 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt @@ -1,7 +1,8 @@ using System; -using System.Collections.Generic; using SqlSugar; +$if(replaceDto.ShowBtnExport) using OfficeOpenXml.Attributes; +$end namespace ${options.ModelsNamespace}.Models { @@ -17,10 +18,14 @@ namespace ${options.ModelsNamespace}.Models $foreach(item in genTable.Columns) /// /// 描述 :${item.ColumnComment} ${item.Remark} - /// 空值 :$if(item.IsRequired == "True") false $else true $end + /// 空值 :$if(item.IsRequired == "True")false${else}true${end} /// $if(replaceDto.ShowBtnExport) +$if(item.IsExport) [EpplusTableColumn(Header = "$if(item.ColumnComment == "")${item.CsharpField}${else}${item.ColumnComment}${end}"$if(item.CsharpType == "DateTime"), NumberFormat = "yyyy-MM-dd HH:mm:ss"$end)] +$else + [EpplusIgnore] +$end $end $if(item.IsPk || item.IsIncrement) [SugarColumn(IsPrimaryKey = ${item.IsPk.ToString().ToLower()}, IsIdentity = ${item.IsIncrement.ToString().ToLower()}$if(item.CsharpField.ToLower() != item.ColumnName.ToLower()), ColumnName = "$item.ColumnName"$end)] diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 7d01a16..c2ec709 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -480,6 +480,7 @@ namespace ZR.CodeGenerator IsInsert = !column.IsIdentity || GenConstants.inputDtoNoField.Any(f => f.Contains(column.DbColumnName, StringComparison.OrdinalIgnoreCase)),//非自增字段都需要插入 IsEdit = true, IsQuery = false, + IsExport = true, HtmlType = GenConstants.HTML_INPUT, }; diff --git a/ZR.Model/System/Dto/GenTableDto.cs b/ZR.Model/System/Dto/GenTableDto.cs index ba03241..e934e60 100644 --- a/ZR.Model/System/Dto/GenTableDto.cs +++ b/ZR.Model/System/Dto/GenTableDto.cs @@ -59,6 +59,7 @@ namespace ZR.Model.System.Dto public bool IsQuery { get; set; } public bool IsSort { get; set; } public bool IsRequired { get; set; } + public bool IsExport { get; set; } /// /// 显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件) /// @@ -77,5 +78,4 @@ namespace ZR.Model.System.Dto /// public string Remark { get; set; } } - } diff --git a/ZR.Model/System/Generate/GenTableColumn.cs b/ZR.Model/System/Generate/GenTableColumn.cs index 72efcbd..8e8294c 100644 --- a/ZR.Model/System/Generate/GenTableColumn.cs +++ b/ZR.Model/System/Generate/GenTableColumn.cs @@ -75,6 +75,10 @@ namespace ZR.Model.System.Generate /// public bool IsSort { get; set; } /// + /// 是否导出(1是) + /// + public bool IsExport { get; set; } + /// /// 显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件) /// public string HtmlType { get; set; } diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index 99780ef..b98b6cc 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -225,7 +225,8 @@ namespace ZR.Service.System it.DictType, it.Update_by, it.Remark, - it.IsSort + it.IsSort, + it.IsExport }) .ExecuteCommand(); } diff --git a/document/admin-mysql.sql b/document/admin-mysql.sql index ee29b1c..2cfb08e 100644 --- a/document/admin-mysql.sql +++ b/document/admin-mysql.sql @@ -788,6 +788,7 @@ CREATE TABLE `gen_table_column` ( `isList` tinyint(1) NULL DEFAULT NULL COMMENT '是否列表字段(1是)', `isQuery` tinyint(4) NULL DEFAULT NULL COMMENT '是否查询字段(1是)', `isSort` tinyint(4) NULL DEFAULT NULL COMMENT '是否排序字段(1是)', + `isExport` tinyint(4) NULL DEFAULT NULL COMMENT '是否导出字段(1是)', `queryType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'EQ' COMMENT '查询方式(等于、不等于、大于、小于、范围)', `htmlType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件)', `dictType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型', diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql index 3ae42a5..9ca30e0 100644 --- a/document/admin-sqlserver.sql +++ b/document/admin-sqlserver.sql @@ -738,6 +738,7 @@ create table gen_table_column ( isList TINYINT , --'是否列表字段(1是)', isSort TINYINT , --'是否排序字段(1是)', isQuery TINYINT ,-- '是否查询字段(1是)', + isExport TINYINT ,-- '是否导出字段(1是)', queryType varchar(200) default 'EQ' , --'查询方式(等于、不等于、大于、小于、范围)', htmlType varchar(200) , --'显示类型(文本框、文本域、下拉框、复选框、单选框、日期控件)', dictType varchar(200) default '' , --'字典类型',