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 4c7e482..62de925 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,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
@@ -13,14 +16,14 @@ import java.util.Date;
* id;
*/
@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;
diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
index 4946ac3..c7562de 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataProcessApprova.java
@@ -1,26 +1,29 @@
-package com.mdp.form.entity;
-
+package com.mdp.form.entity;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormDataProcessApprova所有属性名:
- * branchId,procInstId,agree,assignee,mainTitle,actId,taskName,commentMsg,id,eventName,bizKey,modelKey,flowLastTime,flowBranchId,flowState,startUserid,procDefId,modelName,formId,formDataId;
- * 表 FORM.form_data_process_approva form_data_process_approva的所有字段名:
- * branch_id,proc_inst_id,agree,assignee,main_title,act_id,task_name,comment_msg,id,event_name,biz_key,model_key,flow_last_time,flow_branch_id,flow_state,start_userid,proc_def_id,model_name,form_id,form_data_id;
+ * "branchId","机构编号","procInstId","流程实例编号","agree","审批状态同意1不同意0","assignee","审批人","mainTitle","流程标题","actId","审批节点编号","taskName","审批环节","commentMsg","审批意见","id","主键","eventName","事件类型create/assignment/complete/delete/PROCESS_CREATED/PROCESS_COMPLETE/PROCESS_CANCELLED","bizKey","业务主键发起时上送，原样返回","modelKey","流程key，可以根据该key找到对应的流程模型也代表审批事项，就是审什么内容","flowLastTime","最后更新时间","flowBranchId","流程审批机构号","flowState","0初始1审批中2审批通过3审批不通过4流程取消或者删除","startUserid","启动人","procDefId","流程定义编号带版本的","modelName","模型名称，也代表审批事项，就是审什么内容","formId","表单编号","formDataId","表单数据编号","endTime","结束时间";
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="form_data_process_approva")
+ @Data
+@TableName("form_data_process_approva")
+@ApiModel(description="企业入驻审核流程")
public class FormDataProcessApprova 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 branchId;
@@ -78,256 +81,21 @@ public class FormDataProcessApprova implements java.io.Serializable {
@ApiModelProperty(notes="表单数据编号",allowEmptyValue=true,example="",allowableValues="")
String formDataId;
+
+ @ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="")
+ Date endTime;
- /**主键**/
+ /**
+ *主键
+ **/
public FormDataProcessApprova(String id) {
this.id = id;
}
- /**form_data_process_approva**/
+ /**
+ * 企业入驻审核流程
+ **/
public FormDataProcessApprova() {
}
-
- /**
- * 机构编号
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 流程实例编号
- **/
- public void setProcInstId(String procInstId) {
- this.procInstId = procInstId;
- }
- /**
- * 审批状态同意1不同意0
- **/
- public void setAgree(String agree) {
- this.agree = agree;
- }
- /**
- * 审批人
- **/
- public void setAssignee(String assignee) {
- this.assignee = assignee;
- }
- /**
- * 流程标题
- **/
- public void setMainTitle(String mainTitle) {
- this.mainTitle = mainTitle;
- }
- /**
- * 审批节点编号
- **/
- public void setActId(String actId) {
- this.actId = actId;
- }
- /**
- * 审批环节
- **/
- public void setTaskName(String taskName) {
- this.taskName = taskName;
- }
- /**
- * 审批意见
- **/
- public void setCommentMsg(String commentMsg) {
- this.commentMsg = commentMsg;
- }
- /**
- * 主键
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 事件类型create/assignment/complete/delete/PROCESS_CREATED/PROCESS_COMPLETE/PROCESS_CANCELLED
- **/
- public void setEventName(String eventName) {
- this.eventName = eventName;
- }
- /**
- * 业务主键发起时上送，原样返回
- **/
- public void setBizKey(String bizKey) {
- this.bizKey = bizKey;
- }
- /**
- * 流程key，可以根据该key找到对应的流程模型也代表审批事项，就是审什么内容
- **/
- public void setModelKey(String modelKey) {
- this.modelKey = modelKey;
- }
- /**
- * 最后更新时间
- **/
- public void setFlowLastTime(Date flowLastTime) {
- this.flowLastTime = flowLastTime;
- }
- /**
- * 流程审批机构号
- **/
- public void setFlowBranchId(String flowBranchId) {
- this.flowBranchId = flowBranchId;
- }
- /**
- * 0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setFlowState(String flowState) {
- this.flowState = flowState;
- }
- /**
- * 启动人
- **/
- public void setStartUserid(String startUserid) {
- this.startUserid = startUserid;
- }
- /**
- * 流程定义编号带版本的
- **/
- public void setProcDefId(String procDefId) {
- this.procDefId = procDefId;
- }
- /**
- * 模型名称，也代表审批事项，就是审什么内容
- **/
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
- /**
- * 表单编号
- **/
- public void setFormId(String formId) {
- this.formId = formId;
- }
- /**
- * 表单数据编号
- **/
- public void setFormDataId(String formDataId) {
- this.formDataId = formDataId;
- }
-
- /**
- * 机构编号
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 流程实例编号
- **/
- public String getProcInstId() {
- return this.procInstId;
- }
- /**
- * 审批状态同意1不同意0
- **/
- public String getAgree() {
- return this.agree;
- }
- /**
- * 审批人
- **/
- public String getAssignee() {
- return this.assignee;
- }
- /**
- * 流程标题
- **/
- public String getMainTitle() {
- return this.mainTitle;
- }
- /**
- * 审批节点编号
- **/
- public String getActId() {
- return this.actId;
- }
- /**
- * 审批环节
- **/
- public String getTaskName() {
- return this.taskName;
- }
- /**
- * 审批意见
- **/
- public String getCommentMsg() {
- return this.commentMsg;
- }
- /**
- * 主键
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 事件类型create/assignment/complete/delete/PROCESS_CREATED/PROCESS_COMPLETE/PROCESS_CANCELLED
- **/
- public String getEventName() {
- return this.eventName;
- }
- /**
- * 业务主键发起时上送，原样返回
- **/
- public String getBizKey() {
- return this.bizKey;
- }
- /**
- * 流程key，可以根据该key找到对应的流程模型也代表审批事项，就是审什么内容
- **/
- public String getModelKey() {
- return this.modelKey;
- }
- /**
- * 最后更新时间
- **/
- public Date getFlowLastTime() {
- return this.flowLastTime;
- }
- /**
- * 流程审批机构号
- **/
- public String getFlowBranchId() {
- return this.flowBranchId;
- }
- /**
- * 0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getFlowState() {
- return this.flowState;
- }
- /**
- * 启动人
- **/
- public String getStartUserid() {
- return this.startUserid;
- }
- /**
- * 流程定义编号带版本的
- **/
- public String getProcDefId() {
- return this.procDefId;
- }
- /**
- * 模型名称，也代表审批事项，就是审什么内容
- **/
- public String getModelName() {
- return this.modelName;
- }
- /**
- * 表单编号
- **/
- public String getFormId() {
- return this.formId;
- }
- /**
- * 表单数据编号
- **/
- public String getFormDataId() {
- return this.formDataId;
- }
}
\ No newline at end of file
diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
index 93fe774..a1b9d5d 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDataTag.java
@@ -1,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
@@ -13,14 +16,14 @@ import java.util.Date;
* id;
*/
@Data
+@TableName("form_data_tag")
@ApiModel(description="form_data_tag")
public class FormDataTag 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 dataId;
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 528fd5d..28e5cbb 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
@@ -1,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
@@ -13,14 +16,14 @@ import java.util.Date;
* id;
*/
@Data
+@TableName("form_def")
@ApiModel(description="表单定义")
public class FormDef 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 tableName;
diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
index 9f15d72..c063b97 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDefTag.java
@@ -1,26 +1,29 @@
-package com.mdp.form.entity;
-
+package com.mdp.form.entity;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormDefTag所有属性名:
- * formId,tagId,tagName,id,createTime;
- * 表 FORM.form_def_tag form_def_tag的所有字段名:
- * form_id,tag_id,tag_name,id,create_time;
+ * "formId","表单编号","tagId","标签编号","tagName","标签名字","id","主键","createTime","添加事件";
* 当前主键(包括多主键):
* id;
*/
+ @Data
+@TableName("form_def_tag")
@ApiModel(description="form_def_tag")
public class FormDefTag 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 formId;
@@ -34,75 +37,17 @@ public class FormDefTag implements java.io.Serializable {
@ApiModelProperty(notes="添加事件",allowEmptyValue=true,example="",allowableValues="")
Date createTime;
- /**主键**/
+ /**
+ *主键
+ **/
public FormDefTag(String id) {
this.id = id;
}
- /**form_def_tag**/
+ /**
+ * form_def_tag
+ **/
public FormDefTag() {
}
-
- /**
- * 表单编号
- **/
- public void setFormId(String formId) {
- this.formId = formId;
- }
- /**
- * 标签编号
- **/
- public void setTagId(String tagId) {
- this.tagId = tagId;
- }
- /**
- * 标签名字
- **/
- public void setTagName(String tagName) {
- this.tagName = tagName;
- }
- /**
- * 主键
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 添加事件
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- /**
- * 表单编号
- **/
- public String getFormId() {
- return this.formId;
- }
- /**
- * 标签编号
- **/
- public String getTagId() {
- return this.tagId;
- }
- /**
- * 标签名字
- **/
- public String getTagName() {
- return this.tagName;
- }
- /**
- * 主键
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 添加事件
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
}
\ No newline at end of file
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 1fc64da..d51ddf6 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
@@ -1,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
@@ -13,14 +16,14 @@ import java.math.BigDecimal;
* id;
*/
@Data
+@TableName("form_field")
@ApiModel(description="表单字段定义")
public class FormField 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 formId;
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 06722df..ca55fda 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
@@ -1,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,14 +15,14 @@ import io.swagger.annotations.ApiModelProperty;
* form_id;
*/
@Data
+@TableName("form_qx")
@ApiModel(description="表单权限")
public class FormQx implements java.io.Serializable {
private static final long serialVersionUID = 1L;
-
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(notes="表单编号,主键",allowEmptyValue=true,example="",allowableValues="")
String formId;
-
@ApiModelProperty(notes="允许那些角色查询,号分割",allowEmptyValue=true,example="",allowableValues="")
String allowQueryRoleids;
diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormView.java b/mdp-form/src/main/java/com/mdp/form/entity/FormView.java
index a3e56a4..2ab7a3d 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormView.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormView.java
@@ -1,6 +1,9 @@
package com.mdp.form.entity;
-
import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mdp.core.dao.annotation.TableIds;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,14 +15,14 @@ import io.swagger.annotations.ApiModelProperty;
* id;
*/
@Data
+@TableName("form_view")
@ApiModel(description="表单页面")
public class FormView 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 formId;