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 c7fdda3..4c7e482 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,19 +1,19 @@
-package com.mdp.form.entity;
+package com.mdp.form.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 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,attachmentNames,branchId,bizKey,deptid,flowState,createTime,dqxCode,cuserid,tagIds,tagNames,cusername,deptName;
- * 表 FORM.form_data form_data的所有字段名:
- * id,two,three,four,five,six,seven,eight,nine,ten,last_time,one,zero,remark,form_id,userid,eleven,twelve,thirteen,fourteen,fifteen,attachment_urls,attachment_names,branch_id,biz_key,deptid,flow_state,create_time,dqx_code,cuserid,tag_ids,tag_names,cusername,dept_name;
+ * "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;
*/
-@ApiModel(description="form_data")
+ @Data
+@ApiModel(description="表单数据表")
public class FormData implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -91,7 +91,7 @@ public class FormData implements java.io.Serializable {
@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
String branchId;
- @ApiModelProperty(notes="唯一确定该业务的主键",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="唯一确定该业务的主键竖线分隔多个，如果是联合组件的话",allowEmptyValue=true,example="",allowableValues="")
String bizKey;
@ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="")
@@ -121,423 +121,17 @@ public class FormData implements java.io.Serializable {
@ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="")
String deptName;
- /**主键**/
+ /**
+ *主键
+ **/
public FormData(String id) {
this.id = id;
}
- /**form_data**/
+ /**
+ * 表单数据表
+ **/
public FormData() {
}
-
- /**
- * 主键
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 属性二
- **/
- public void setTwo(String two) {
- this.two = two;
- }
- /**
- * 属性三
- **/
- public void setThree(String three) {
- this.three = three;
- }
- /**
- * 属性四
- **/
- public void setFour(String four) {
- this.four = four;
- }
- /**
- * 属性五
- **/
- public void setFive(String five) {
- this.five = five;
- }
- /**
- * 属性六
- **/
- public void setSix(String six) {
- this.six = six;
- }
- /**
- * 属性七
- **/
- public void setSeven(String seven) {
- this.seven = seven;
- }
- /**
- * 属性八
- **/
- public void setEight(String eight) {
- this.eight = eight;
- }
- /**
- * 属性九
- **/
- public void setNine(String nine) {
- this.nine = nine;
- }
- /**
- * 属性十
- **/
- public void setTen(String ten) {
- this.ten = ten;
- }
- /**
- * 最后更新日期
- **/
- public void setLastTime(Date lastTime) {
- this.lastTime = lastTime;
- }
- /**
- * 属性一
- **/
- public void setOne(String one) {
- this.one = one;
- }
- /**
- * 属性零
- **/
- public void setZero(String zero) {
- this.zero = zero;
- }
- /**
- * 备注
- **/
- public void setRemark(String remark) {
- this.remark = remark;
- }
- /**
- * 表单编号
- **/
- public void setFormId(String formId) {
- this.formId = formId;
- }
- /**
- * 最后更新人
- **/
- public void setUserid(String userid) {
- this.userid = userid;
- }
- /**
- * 字段十一
- **/
- public void setEleven(String eleven) {
- this.eleven = eleven;
- }
- /**
- * 字段十二
- **/
- public void setTwelve(String twelve) {
- this.twelve = twelve;
- }
- /**
- * 字段十三
- **/
- public void setThirteen(String thirteen) {
- this.thirteen = thirteen;
- }
- /**
- * 字段十四
- **/
- public void setFourteen(String fourteen) {
- this.fourteen = fourteen;
- }
- /**
- * 字段十五
- **/
- public void setFifteen(String fifteen) {
- this.fifteen = fifteen;
- }
- /**
- * 附件url多个
- **/
- public void setAttachmentUrls(String attachmentUrls) {
- this.attachmentUrls = attachmentUrls;
- }
- /**
- * 附件名称多个
- **/
- public void setAttachmentNames(String attachmentNames) {
- this.attachmentNames = attachmentNames;
- }
- /**
- * 机构编号
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 唯一确定该业务的主键
- **/
- public void setBizKey(String bizKey) {
- this.bizKey = bizKey;
- }
- /**
- * 创建部门
- **/
- public void setDeptid(String deptid) {
- this.deptid = deptid;
- }
- /**
- * 0初始1审批中2结束审批
- **/
- public void setFlowState(String flowState) {
- this.flowState = flowState;
- }
- /**
- * 创建时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * 数据权限码
- **/
- public void setDqxCode(String dqxCode) {
- this.dqxCode = dqxCode;
- }
- /**
- * 创建人编号
- **/
- public void setCuserid(String cuserid) {
- this.cuserid = cuserid;
- }
- /**
- * 标签编号列表逗号分割
- **/
- public void setTagIds(String tagIds) {
- this.tagIds = tagIds;
- }
- /**
- * 标签名列表逗号分割
- **/
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
- /**
- * 创建人姓名
- **/
- public void setCusername(String cusername) {
- this.cusername = cusername;
- }
- /**
- * 创建部门
- **/
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- /**
- * 主键
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 属性二
- **/
- public String getTwo() {
- return this.two;
- }
- /**
- * 属性三
- **/
- public String getThree() {
- return this.three;
- }
- /**
- * 属性四
- **/
- public String getFour() {
- return this.four;
- }
- /**
- * 属性五
- **/
- public String getFive() {
- return this.five;
- }
- /**
- * 属性六
- **/
- public String getSix() {
- return this.six;
- }
- /**
- * 属性七
- **/
- public String getSeven() {
- return this.seven;
- }
- /**
- * 属性八
- **/
- public String getEight() {
- return this.eight;
- }
- /**
- * 属性九
- **/
- public String getNine() {
- return this.nine;
- }
- /**
- * 属性十
- **/
- public String getTen() {
- return this.ten;
- }
- /**
- * 最后更新日期
- **/
- public Date getLastTime() {
- return this.lastTime;
- }
- /**
- * 属性一
- **/
- public String getOne() {
- return this.one;
- }
- /**
- * 属性零
- **/
- public String getZero() {
- return this.zero;
- }
- /**
- * 备注
- **/
- public String getRemark() {
- return this.remark;
- }
- /**
- * 表单编号
- **/
- public String getFormId() {
- return this.formId;
- }
- /**
- * 最后更新人
- **/
- public String getUserid() {
- return this.userid;
- }
- /**
- * 字段十一
- **/
- public String getEleven() {
- return this.eleven;
- }
- /**
- * 字段十二
- **/
- public String getTwelve() {
- return this.twelve;
- }
- /**
- * 字段十三
- **/
- public String getThirteen() {
- return this.thirteen;
- }
- /**
- * 字段十四
- **/
- public String getFourteen() {
- return this.fourteen;
- }
- /**
- * 字段十五
- **/
- public String getFifteen() {
- return this.fifteen;
- }
- /**
- * 附件url多个
- **/
- public String getAttachmentUrls() {
- return this.attachmentUrls;
- }
- /**
- * 附件名称多个
- **/
- public String getAttachmentNames() {
- return this.attachmentNames;
- }
- /**
- * 机构编号
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 唯一确定该业务的主键
- **/
- public String getBizKey() {
- return this.bizKey;
- }
- /**
- * 创建部门
- **/
- public String getDeptid() {
- return this.deptid;
- }
- /**
- * 0初始1审批中2结束审批
- **/
- public String getFlowState() {
- return this.flowState;
- }
- /**
- * 创建时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * 数据权限码
- **/
- public String getDqxCode() {
- return this.dqxCode;
- }
- /**
- * 创建人编号
- **/
- public String getCuserid() {
- return this.cuserid;
- }
- /**
- * 标签编号列表逗号分割
- **/
- public String getTagIds() {
- return this.tagIds;
- }
- /**
- * 标签名列表逗号分割
- **/
- public String getTagNames() {
- return this.tagNames;
- }
- /**
- * 创建人姓名
- **/
- public String getCusername() {
- return this.cusername;
- }
- /**
- * 创建部门
- **/
- public String getDeptName() {
- return this.deptName;
- }
}
\ 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 7437de4..93fe774 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,18 +1,18 @@
-package com.mdp.form.entity;
+package com.mdp.form.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormDataTag所有属性名:
- * dataId,tagId,tagName,id,createTime;
- * 表 FORM.form_data_tag form_data_tag的所有字段名:
- * data_id,tag_id,tag_name,id,create_time;
+ * "dataId","表单数据编号","tagId","标签编号","tagName","标签名字","id","主键","createTime","添加事件";
* 当前主键(包括多主键):
* id;
*/
+ @Data
@ApiModel(description="form_data_tag")
public class FormDataTag implements java.io.Serializable {
@@ -34,75 +34,17 @@ public class FormDataTag implements java.io.Serializable {
@ApiModelProperty(notes="添加事件",allowEmptyValue=true,example="",allowableValues="")
Date createTime;
- /**主键**/
+ /**
+ *主键
+ **/
public FormDataTag(String id) {
this.id = id;
}
- /**form_data_tag**/
+ /**
+ * form_data_tag
+ **/
public FormDataTag() {
}
-
- /**
- * 表单数据编号
- **/
- public void setDataId(String dataId) {
- this.dataId = dataId;
- }
- /**
- * 标签编号
- **/
- 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 getDataId() {
- return this.dataId;
- }
- /**
- * 标签编号
- **/
- 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/FormDef.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDef.java
index 6711a54..31e7579 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,19 +1,19 @@
-package com.mdp.form.entity;
+package com.mdp.form.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormDef所有属性名:
- * id,tableName,tableOwner,isCreateTable,formName,userid,deptid,formType,isTemplate,bizType,ctime,branchId,categoryId,tagIds,tagNames,username,deptName;
- * 表 FORM.form_def form_def的所有字段名:
- * id,table_name,table_owner,is_create_table,form_name,userid,deptid,form_type,is_template,biz_type,ctime,branch_id,category_id,tag_ids,tag_names,username,dept_name;
+ * "id","主键","tableName","表名","tableOwner","表名拥有者","isCreateTable","是否已经创建库表","formName","表单名称","userid","创建人","deptid","创建部门","formType","表单类型","isTemplate","是否为模板","bizType","业务分类","ctime","创建日期","branchId","机构编号","categoryId","分类编号","tagIds","标签编号列表","tagNames","标签名字列表","username","创建人姓名","deptName","创建部门";
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="form_def")
+ @Data
+@ApiModel(description="表单定义")
public class FormDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -70,219 +70,17 @@ public class FormDef implements java.io.Serializable {
@ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="")
String deptName;
- /**主键**/
+ /**
+ *主键
+ **/
public FormDef(String id) {
this.id = id;
}
- /**form_def**/
+ /**
+ * 表单定义
+ **/
public FormDef() {
}
-
- /**
- * 主键
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 表名
- **/
- public void setTableName(String tableName) {
- this.tableName = tableName;
- }
- /**
- * 表名拥有者
- **/
- public void setTableOwner(String tableOwner) {
- this.tableOwner = tableOwner;
- }
- /**
- * 是否已经创建库表
- **/
- public void setIsCreateTable(String isCreateTable) {
- this.isCreateTable = isCreateTable;
- }
- /**
- * 表单名称
- **/
- public void setFormName(String formName) {
- this.formName = formName;
- }
- /**
- * 创建人
- **/
- public void setUserid(String userid) {
- this.userid = userid;
- }
- /**
- * 创建部门
- **/
- public void setDeptid(String deptid) {
- this.deptid = deptid;
- }
- /**
- * 表单类型
- **/
- public void setFormType(String formType) {
- this.formType = formType;
- }
- /**
- * 是否为模板
- **/
- public void setIsTemplate(String isTemplate) {
- this.isTemplate = isTemplate;
- }
- /**
- * 业务分类
- **/
- public void setBizType(String bizType) {
- this.bizType = bizType;
- }
- /**
- * 创建日期
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 机构编号
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 分类编号
- **/
- public void setCategoryId(String categoryId) {
- this.categoryId = categoryId;
- }
- /**
- * 标签编号列表
- **/
- public void setTagIds(String tagIds) {
- this.tagIds = tagIds;
- }
- /**
- * 标签名字列表
- **/
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
- /**
- * 创建人姓名
- **/
- public void setUsername(String username) {
- this.username = username;
- }
- /**
- * 创建部门
- **/
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- /**
- * 主键
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 表名
- **/
- public String getTableName() {
- return this.tableName;
- }
- /**
- * 表名拥有者
- **/
- public String getTableOwner() {
- return this.tableOwner;
- }
- /**
- * 是否已经创建库表
- **/
- public String getIsCreateTable() {
- return this.isCreateTable;
- }
- /**
- * 表单名称
- **/
- public String getFormName() {
- return this.formName;
- }
- /**
- * 创建人
- **/
- public String getUserid() {
- return this.userid;
- }
- /**
- * 创建部门
- **/
- public String getDeptid() {
- return this.deptid;
- }
- /**
- * 表单类型
- **/
- public String getFormType() {
- return this.formType;
- }
- /**
- * 是否为模板
- **/
- public String getIsTemplate() {
- return this.isTemplate;
- }
- /**
- * 业务分类
- **/
- public String getBizType() {
- return this.bizType;
- }
- /**
- * 创建日期
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 机构编号
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 分类编号
- **/
- public String getCategoryId() {
- return this.categoryId;
- }
- /**
- * 标签编号列表
- **/
- public String getTagIds() {
- return this.tagIds;
- }
- /**
- * 标签名字列表
- **/
- public String getTagNames() {
- return this.tagNames;
- }
- /**
- * 创建人姓名
- **/
- public String getUsername() {
- return this.username;
- }
- /**
- * 创建部门
- **/
- public String getDeptName() {
- return this.deptName;
- }
}
\ No newline at end of file
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 a8915fa..06722df 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,18 +1,18 @@
-package com.mdp.form.entity;
+package com.mdp.form.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormQx所有属性名:
- * formId,allowQueryRoleids,allowQueryDeptids,allowQueryUserids,notQueryRoleids,notQueryDeptids,notQueryUserids,allowOtherQuery,allowOtherEdit,allowOtherDel,doDeptLvlCheck,deptLvlQx;
- * 表 FORM.form_qx form_qx的所有字段名:
- * form_id,allow_query_roleids,allow_query_deptids,allow_query_userids,not_query_roleids,not_query_deptids,not_query_userids,allow_other_query,allow_other_edit,allow_other_del,do_dept_lvl_check,dept_lvl_qx;
+ * "formId","表单编号","allowQueryRoleids","允许那些角色查询,号分割","allowQueryDeptids","允许那些部门查询,号分割","allowQueryUserids","允许哪些人查询,号分割","notQueryRoleids","禁止哪些角色查询","notQueryDeptids","禁止哪些部门查询","notQueryUserids","禁止哪些人查询","allowOtherQuery","是否允许其它人查询","allowOtherEdit","是否允许其它人修改","allowOtherDel","是否允许其它人删除","doDeptLvlCheck","是否进行部门级别传递权限检查","deptLvlQx","部门级别权限";
* 当前主键(包括多主键):
* form_id;
*/
-@ApiModel(description="form_qx")
+ @Data
+@ApiModel(description="表单权限")
public class FormQx implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -54,159 +54,17 @@ public class FormQx implements java.io.Serializable {
@ApiModelProperty(notes="部门级别权限",allowEmptyValue=true,example="",allowableValues="")
String deptLvlQx;
- /**表单编号**/
+ /**
+ *表单编号
+ **/
public FormQx(String formId) {
this.formId = formId;
}
- /**form_qx**/
+ /**
+ * 表单权限
+ **/
public FormQx() {
}
-
- /**
- * 表单编号
- **/
- public void setFormId(String formId) {
- this.formId = formId;
- }
- /**
- * 允许那些角色查询,号分割
- **/
- public void setAllowQueryRoleids(String allowQueryRoleids) {
- this.allowQueryRoleids = allowQueryRoleids;
- }
- /**
- * 允许那些部门查询,号分割
- **/
- public void setAllowQueryDeptids(String allowQueryDeptids) {
- this.allowQueryDeptids = allowQueryDeptids;
- }
- /**
- * 允许哪些人查询,号分割
- **/
- public void setAllowQueryUserids(String allowQueryUserids) {
- this.allowQueryUserids = allowQueryUserids;
- }
- /**
- * 禁止哪些角色查询
- **/
- public void setNotQueryRoleids(String notQueryRoleids) {
- this.notQueryRoleids = notQueryRoleids;
- }
- /**
- * 禁止哪些部门查询
- **/
- public void setNotQueryDeptids(String notQueryDeptids) {
- this.notQueryDeptids = notQueryDeptids;
- }
- /**
- * 禁止哪些人查询
- **/
- public void setNotQueryUserids(String notQueryUserids) {
- this.notQueryUserids = notQueryUserids;
- }
- /**
- * 是否允许其它人查询
- **/
- public void setAllowOtherQuery(String allowOtherQuery) {
- this.allowOtherQuery = allowOtherQuery;
- }
- /**
- * 是否允许其它人修改
- **/
- public void setAllowOtherEdit(String allowOtherEdit) {
- this.allowOtherEdit = allowOtherEdit;
- }
- /**
- * 是否允许其它人删除
- **/
- public void setAllowOtherDel(String allowOtherDel) {
- this.allowOtherDel = allowOtherDel;
- }
- /**
- * 是否进行部门级别传递权限检查
- **/
- public void setDoDeptLvlCheck(String doDeptLvlCheck) {
- this.doDeptLvlCheck = doDeptLvlCheck;
- }
- /**
- * 部门级别权限
- **/
- public void setDeptLvlQx(String deptLvlQx) {
- this.deptLvlQx = deptLvlQx;
- }
-
- /**
- * 表单编号
- **/
- public String getFormId() {
- return this.formId;
- }
- /**
- * 允许那些角色查询,号分割
- **/
- public String getAllowQueryRoleids() {
- return this.allowQueryRoleids;
- }
- /**
- * 允许那些部门查询,号分割
- **/
- public String getAllowQueryDeptids() {
- return this.allowQueryDeptids;
- }
- /**
- * 允许哪些人查询,号分割
- **/
- public String getAllowQueryUserids() {
- return this.allowQueryUserids;
- }
- /**
- * 禁止哪些角色查询
- **/
- public String getNotQueryRoleids() {
- return this.notQueryRoleids;
- }
- /**
- * 禁止哪些部门查询
- **/
- public String getNotQueryDeptids() {
- return this.notQueryDeptids;
- }
- /**
- * 禁止哪些人查询
- **/
- public String getNotQueryUserids() {
- return this.notQueryUserids;
- }
- /**
- * 是否允许其它人查询
- **/
- public String getAllowOtherQuery() {
- return this.allowOtherQuery;
- }
- /**
- * 是否允许其它人修改
- **/
- public String getAllowOtherEdit() {
- return this.allowOtherEdit;
- }
- /**
- * 是否允许其它人删除
- **/
- public String getAllowOtherDel() {
- return this.allowOtherDel;
- }
- /**
- * 是否进行部门级别传递权限检查
- **/
- public String getDoDeptLvlCheck() {
- return this.doDeptLvlCheck;
- }
- /**
- * 部门级别权限
- **/
- public String getDeptLvlQx() {
- return this.deptLvlQx;
- }
}
\ No newline at end of file
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 386c86f..a3e56a4 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,71 +1,46 @@
-package com.mdp.form.entity;
-
+package com.mdp.form.entity;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
/**
- * 组织 com.qqkj 顶级模块 mdp 大模块 form 小模块
+ * 组织 com 顶级模块 mdp 大模块 form 小模块
* 实体 FormView所有属性名:
- * formId,id,viewContext,bizId;
- * 表 FORM.form_view 表单页面的所有字段名:
- * form_id,id,view_context,biz_id;
+ * "formId","表单主键","id","视图主键","viewContext","页面html内容","bizId","关联的业务功能编号";
* 当前主键(包括多主键):
* id;
*/
-
+ @Data
+@ApiModel(description="表单页面")
public class FormView implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- /**表单主键**/
- String formId;
-
- /**视图主键**/
+ @ApiModelProperty(notes="视图主键,主键",allowEmptyValue=true,example="",allowableValues="")
String id;
+
+
+ @ApiModelProperty(notes="表单主键",allowEmptyValue=true,example="",allowableValues="")
+ String formId;
- /**页面html内容**/
+ @ApiModelProperty(notes="页面html内容",allowEmptyValue=true,example="",allowableValues="")
String viewContext;
- /**关联的业务功能编号**/
+ @ApiModelProperty(notes="关联的业务功能编号",allowEmptyValue=true,example="",allowableValues="")
String bizId;
-
- public FormView() {
- }
+ /**
+ *视图主键
+ **/
public FormView(String id) {
- this.id=id;
- }
-
- /**表单主键**/
- public void setFormId(String formId) {
- this.formId = formId;
- }
- /**视图主键**/
- public void setId(String id) {
this.id = id;
}
- /**页面html内容**/
- public void setViewContext(String viewContext) {
- this.viewContext = viewContext;
- }
- /**关联的业务功能编号**/
- public void setBizId(String bizId) {
- this.bizId = bizId;
- }
-
- /** 表单主键**/
- public String getFormId() {
- return this.formId;
- }
- /** 视图主键**/
- public String getId() {
- return this.id;
- }
- /** 页面html内容**/
- public String getViewContext() {
- return this.viewContext;
- }
- /** 关联的业务功能编号**/
- public String getBizId() {
- return this.bizId;
+
+ /**
+ * 表单页面
+ **/
+ public FormView() {
}
}
\ No newline at end of file
diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
index 6ef8e37..7275c6c 100644
--- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
+++ b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml
@@ -3,27 +3,66 @@
-
-
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+ and res.cuserid in
+
+ #{item}
+
+
+ and res.flow_state in
+
+ #{item}
+
+
+ and res.deptid in
+
+ #{item}
+
+
+ and res.create_time between #{fromStartTime} and #{toStartTime}
+ and res.cuserid in
+
+ #{item}
+
+
+ and res.userid in
+
+ #{item}
+
+
+ and exists ( select 1 from form.form_data_tag tag where tag.data_id = res.id and tag.tag_id in
+
+ #{item}
+ )
+
+ and exists(select 1 from form.form_data_process_approva app where app.proc_inst_id=#{procInstId} and res.id=app.form_data_id )
+
+
+
update FORM.form_data
- set tag_ids=#{tagIds},tag_names=#{tagNames} where id=#{id}
+ set tag_ids=#{tagIds},tag_names=#{tagNames} where id=#{id}
-
+
-
+
- update FORM.form_data set
- two = #{item.two},
+ update FORM.form_data set
+ two = #{item.two},
three = #{item.three},
four = #{item.four},
five = #{item.five},
@@ -47,7 +86,7 @@
attachment_names = #{item.attachmentNames},
branch_id = #{item.branchId},
biz_key = #{item.bizKey},
- deptid = #{item.deptid},
+ deptid = #{item.deptid},
create_time = #{item.createTime},
dqx_code = #{item.dqxCode},
cuserid = #{item.cuserid},
@@ -55,78 +94,40 @@
tag_names = #{item.tagNames},
cusername = #{item.cusername},
dept_name = #{item.deptName}
- where id = #{item.id}
-
-
-
-
+ where id = #{item.id}
+
+
+
+
update FORM.form_data res,FORM.form_data_process_approva app set res.flow_state=#{flowState},res.last_time=now(),app.flow_state=#{flowState},app.flow_last_time=now()
,app.end_time=now()
where res.form_id=#{formId} and app.form_data_id=res.id and app.proc_inst_id=#{procInstId}
-
+
- update FORM.form_data res
+ update FORM.form_data res
- where EXISTS ( SELECT 1 FROM FORM.form_data_process_approva a where a.proc_inst_id = #{procInstId} AND a.form_data_id = res.id )
+ where EXISTS ( SELECT 1 FROM FORM.form_data_process_approva a where a.proc_inst_id = #{procInstId} AND a.form_data_id = res.id )
-