From f892e1d6f7043d6bec5fb8c833ff3248f82a2543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 18 Sep 2023 13:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdp/form/entity/FormData.java | 49 ++++++++++++++++--- .../java/com/mdp/form/entity/FormDef.java | 8 ++- .../java/com/mdp/form/entity/FormField.java | 2 +- .../main/java/com/mdp/form/entity/FormQx.java | 2 +- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormData.java b/mdp-form/src/main/java/com/mdp/form/entity/FormData.java index 62de925..7775019 100644 --- a/mdp-form/src/main/java/com/mdp/form/entity/FormData.java +++ b/mdp-form/src/main/java/com/mdp/form/entity/FormData.java @@ -1,129 +1,166 @@ package com.mdp.form.entity; import lombok.Data; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.mdp.core.dao.annotation.TableIds; import com.baomidou.mybatisplus.annotation.TableName; +import org.apache.ibatis.type.Alias; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; /** - * 组织 com 顶级模块 mdp 大模块 form 小模块
- * 实体 FormData所有属性名:
- * "id","主键","two","属性二","three","属性三","four","属性四","five","属性五","six","属性六","seven","属性七","eight","属性八","nine","属性九","ten","属性十","lastTime","最后更新日期","one","属性一","zero","属性零","remark","备注","formId","表单编号","userid","最后更新人","eleven","字段十一","twelve","字段十二","thirteen","字段十三","fourteen","字段十四","fifteen","字段十五","attachmentUrls","附件url多个","attachmentNames","附件名称多个","branchId","机构编号","bizKey","唯一确定该业务的主键竖线分隔多个，如果是联合组件的话","deptid","创建部门","flowState","0初始1审批中2结束审批","createTime","创建时间","dqxCode","数据权限码","cuserid","创建人编号","tagIds","标签编号列表逗号分割","tagNames","标签名列表逗号分割","cusername","创建人姓名","deptName","创建部门";
- * 当前主键(包括多主键):
- * id;
+ * @author code-gen + * @since 2023-9-18 */ - @Data +@Data @TableName("form_data") @ApiModel(description="表单数据表") public class FormData implements java.io.Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="") String id; + @ApiModelProperty(notes="属性二",allowEmptyValue=true,example="",allowableValues="") String two; + @ApiModelProperty(notes="属性三",allowEmptyValue=true,example="",allowableValues="") String three; + @ApiModelProperty(notes="属性四",allowEmptyValue=true,example="",allowableValues="") String four; + @ApiModelProperty(notes="属性五",allowEmptyValue=true,example="",allowableValues="") String five; + @ApiModelProperty(notes="属性六",allowEmptyValue=true,example="",allowableValues="") String six; + @ApiModelProperty(notes="属性七",allowEmptyValue=true,example="",allowableValues="") String seven; + @ApiModelProperty(notes="属性八",allowEmptyValue=true,example="",allowableValues="") String eight; + @ApiModelProperty(notes="属性九",allowEmptyValue=true,example="",allowableValues="") String nine; + @ApiModelProperty(notes="属性十",allowEmptyValue=true,example="",allowableValues="") String ten; + @ApiModelProperty(notes="最后更新日期",allowEmptyValue=true,example="",allowableValues="") Date lastTime; + @ApiModelProperty(notes="属性一",allowEmptyValue=true,example="",allowableValues="") String one; + @ApiModelProperty(notes="属性零",allowEmptyValue=true,example="",allowableValues="") String zero; + @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") String remark; + @ApiModelProperty(notes="表单编号",allowEmptyValue=true,example="",allowableValues="") String formId; + @ApiModelProperty(notes="最后更新人",allowEmptyValue=true,example="",allowableValues="") String userid; + @ApiModelProperty(notes="字段十一",allowEmptyValue=true,example="",allowableValues="") String eleven; + @ApiModelProperty(notes="字段十二",allowEmptyValue=true,example="",allowableValues="") String twelve; + @ApiModelProperty(notes="字段十三",allowEmptyValue=true,example="",allowableValues="") String thirteen; + @ApiModelProperty(notes="字段十四",allowEmptyValue=true,example="",allowableValues="") String fourteen; + @ApiModelProperty(notes="字段十五",allowEmptyValue=true,example="",allowableValues="") String fifteen; + @ApiModelProperty(notes="附件url多个",allowEmptyValue=true,example="",allowableValues="") String attachmentUrls; + @ApiModelProperty(notes="附件名称多个",allowEmptyValue=true,example="",allowableValues="") String attachmentNames; + @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") String branchId; + @ApiModelProperty(notes="唯一确定该业务的主键竖线分隔多个，如果是联合组件的话",allowEmptyValue=true,example="",allowableValues="") String bizKey; + @ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="") String deptid; + @ApiModelProperty(notes="0初始1审批中2结束审批",allowEmptyValue=true,example="",allowableValues="") String flowState; + @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") Date createTime; + @ApiModelProperty(notes="数据权限码",allowEmptyValue=true,example="",allowableValues="") String dqxCode; + @ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="") String cuserid; + @ApiModelProperty(notes="标签编号列表逗号分割",allowEmptyValue=true,example="",allowableValues="") String tagIds; + @ApiModelProperty(notes="标签名列表逗号分割",allowEmptyValue=true,example="",allowableValues="") String tagNames; + @ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="") String cusername; + @ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="") String deptName; + + @ApiModelProperty(notes="扩展字段",allowEmptyValue=true,example="",allowableValues="") + String extInfos; + /** *主键 **/ diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java index 9859f86..6034d21 100644 --- a/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java +++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java @@ -12,7 +12,7 @@ import java.util.Date; /** * @author code-gen - * @since 2023-9-16 + * @since 2023-9-18 */ @Data @TableName("form_def") @@ -98,13 +98,17 @@ public class FormDef implements java.io.Serializable { String pks; - @ApiModelProperty(notes="数据存储模式0-form-data表，1-寄存主表某个字段，默认ext_infos字段，3-独立建表，4-其它文件存储",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="数据存储模式1-form-data表，2-寄存主表某个字段，默认ext_infos字段，3-独立建表，4-其它文件存储",allowEmptyValue=true,example="",allowableValues="") String dataType; @ApiModelProperty(notes="数据存储字段，当data_type=1时必填，默认ext_infos",allowEmptyValue=true,example="",allowableValues="") String dataField; + + @ApiModelProperty(notes="扩展字段",allowEmptyValue=true,example="",allowableValues="") + String extInfos; + /** *主键 **/ diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormField.java b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java index 4d49308..691d3fd 100644 --- a/mdp-form/src/main/java/com/mdp/form/entity/FormField.java +++ b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; /** * @author code-gen - * @since 2023-9-15 + * @since 2023-9-18 */ @Data @TableName("form_field") diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java b/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java index 44e062c..96c9f03 100644 --- a/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java +++ b/mdp-form/src/main/java/com/mdp/form/entity/FormQx.java @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @author code-gen - * @since 2023-9-11 + * @since 2023-9-18 */ @Data @TableName("form_qx")