From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index 4f4aea4..2abb94f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -28,11 +28,17 @@
@NotBlank(message = "表描述不能为空")
private String tableComment;
+ /** 关联父表的表名 */
+ private String subTableName;
+
+ /** 本表关联父表的外键名 */
+ private String subTableFkName;
+
/** 实体类名称(首字母大写) */
@NotBlank(message = "实体类名称不能为空")
private String className;
- /** 使用的模板（crud单表操作 tree树表操作） */
+ /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
private String tplCategory;
/** 生成包路径 */
@@ -63,6 +69,9 @@
/** 主键信息 */
private GenTableColumn pkColumn;
+
+ /** 子表信息 */
+ private GenTable subTable;
/** 表列信息 */
@Valid
@@ -114,6 +123,26 @@
public void setTableComment(String tableComment)
{
this.tableComment = tableComment;
+ }
+
+ public String getSubTableName()
+ {
+ return subTableName;
+ }
+
+ public void setSubTableName(String subTableName)
+ {
+ this.subTableName = subTableName;
+ }
+
+ public String getSubTableFkName()
+ {
+ return subTableFkName;
+ }
+
+ public void setSubTableFkName(String subTableFkName)
+ {
+ this.subTableFkName = subTableFkName;
}
public String getClassName()
@@ -216,6 +245,16 @@
this.pkColumn = pkColumn;
}
+ public GenTable getSubTable()
+ {
+ return subTable;
+ }
+
+ public void setSubTable(GenTable subTable)
+ {
+ this.subTable = subTable;
+ }
+
public List<GenTableColumn> getColumns()
{
return columns;
@@ -286,6 +325,16 @@
this.parentMenuName = parentMenuName;
}
+ public boolean isSub()
+ {
+ return isSub(this.tplCategory);
+ }
+
+ public static boolean isSub(String tplCategory)
+ {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+ }
+
public boolean isTree()
{
return isTree(this.tplCategory);
--
Gitblit v1.9.2