diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 75fb02939..9f9b196bb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -91,7 +91,8 @@ public class SysDict implements Serializable { /** * 是否为标签内容-数据字典(1是 0否) */ - @Excel(name = "展示区域", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Excel(name = "是否为标签内容", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") private java.lang.Integer isTagDict; /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index d445cb1df..ecc74d9f8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -83,7 +83,7 @@ public class SysDictItem implements Serializable { private Date updateTime; /**是否为标签内容-数据字典(1是 0否)*/ - @Excel(name = "展示区域", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Excel(name = "是否为标签内容", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") private java.lang.Integer isTagDict; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index 11f314608..2db1b8d17 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -1,6 +1,7 @@ package com.jero.modules.tag.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -23,7 +24,7 @@ import java.io.Serializable; * @Version: V1.0 */ @Data -@TableName("onl_cgform_tag") +@TableName("onl_cgform_field") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="onl_cgform_tag对象", description="标签项管理") @@ -36,64 +37,76 @@ public class OnlCgformTag implements Serializable { private java.lang.String id; /**创建人*/ + @TableField(exist = false) @ApiModelProperty(value = "创建人") private java.lang.String createBy; /**创建日期*/ + @TableField(exist = false) @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; /**更新人*/ + @TableField(exist = false) @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新日期*/ + @TableField(exist = false) @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; /**所属部门*/ + @TableField(exist = false) @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; /**所属模块(1文档库,0文档拆分)*/ + @TableField(exist = false) @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module") @Dict(dicCode = "module") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分") private java.lang.String isModel; /**字段备注*/ - @Excel(name = "字段备注", width = 15) + @Excel(name = "字段备注", width = 15,dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt") + @Dict(dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt") @ApiModelProperty(value = "字段备注") private java.lang.String dbFieldTxt; /**字段英文名称描述*/ - @Excel(name = "字段英文名称描述", width = 15) + @Excel(name = "字段英文名称描述", width = 15,dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name") + @Dict(dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name") @ApiModelProperty(value = "字段英文名称描述") - private java.lang.String dbFieldName; + private java.lang.String dbFieldEnName; /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15, dicCode = "field_show_type") - @Dict(dicCode = "field_show_type") + + @Excel(name = "表单控件类型", width = 15,dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") + @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type",dicCode ="field_show_type") @ApiModelProperty(value = "表单控件类型") private java.lang.String fieldShowType; /**字典名称*/ + @TableField(exist = false) @Excel(name = "字典名称", width = 15, dictTable = "sys_dict", dicText = "dict_name", dicCode = "dict_name") @Dict(dictTable = "sys_dict", dicText = "dict_name", dicCode = "dict_name") @ApiModelProperty(value = "字典名称") private java.lang.String dictName; /**数据库字段长度*/ - @Excel(name = "数据库字段长度", width = 15) + @Excel(name = "数据库字段长度", width = 15,dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length") + @Dict(dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length") @ApiModelProperty(value = "数据库字段长度") private java.lang.Integer dbLength; /**排序*/ - @Excel(name = "排序", width = 15) + @Excel(name = "排序", width = 15,dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num") + @Dict(dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num") @ApiModelProperty(value = "排序") private java.lang.Integer orderNum; @@ -122,6 +135,7 @@ public class OnlCgformTag implements Serializable { private java.lang.Integer isReadOnly; /**展示区域*/ + @TableField(exist = false) @Excel(name = "展示区域", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id") @Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id") @ApiModelProperty(value = "展示区域")