wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：代码生成新增字段导出设置

Browse Source
This commit is contained in:
不做码农 2022-10-19 21:27:53 +08:00
parent 51a244df09
commit 6e0d1ffa9d
8 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -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");
}
/// <summary>

9
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
View File

@ -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)
/// <summary>
/// 描述 :${item.ColumnComment} ${item.Remark}
/// 空值 :$if(item.IsRequired == "True") false $else true $end
/// 空值 :$if(item.IsRequired == "True")false${else}true${end}
/// </summary>
$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)]

1
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -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,
};

2
ZR.Model/System/Dto/GenTableDto.cs
View File

@ -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; }
/// <summary>
/// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
/// </summary>
@ -77,5 +78,4 @@ namespace ZR.Model.System.Dto
/// </summary>
public string Remark { get; set; }
}
}

4
ZR.Model/System/Generate/GenTableColumn.cs
View File

@ -75,6 +75,10 @@ namespace ZR.Model.System.Generate
/// </summary>
public bool IsSort { get; set; }
/// <summary>
/// 是否导出（1是）
/// </summary>
public bool IsExport { get; set; }
/// <summary>
/// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
/// </summary>
public string HtmlType { get; set; }

3
ZR.Service/System/GenTableService.cs
View File

@ -225,7 +225,8 @@ namespace ZR.Service.System
it.DictType,
it.Update_by,
it.Remark,
it.IsSort
it.IsSort,
it.IsExport
})
.ExecuteCommand();
}

1
document/admin-mysql.sql
View File

@ -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 '字典类型',

1
document/admin-sqlserver.sql
View File

@ -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 '' , --'字典类型',