From 7fb2b66a731b79abeb5f1471b24880cc09f5b4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 14 Feb 2023 01:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90form=5Ffiel?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mdp/form/entity/FormDef.java   |  8 +++++++-
 .../mapper/mdp/form/dao/FormDefMapper.xml        | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

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 31e7579..528fd5d 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
@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 mdp 大模块 form  小模块 <br> 
  * 实体 FormDef所有属性名: <br>
- *	"id","主键","tableName","表名","tableOwner","表名拥有者","isCreateTable","是否已经创建库表","formName","表单名称","userid","创建人","deptid","创建部门","formType","表单类型","isTemplate","是否为模板","bizType","业务分类","ctime","创建日期","branchId","机构编号","categoryId","分类编号","tagIds","标签编号列表","tagNames","标签名字列表","username","创建人姓名","deptName","创建部门";<br>
+ *	"id","主键","tableName","表名","tableOwner","表名拥有者","isCreateTable","是否已经创建库表","formName","表单名称","userid","创建人","deptid","创建部门","formType","表单类型","isTemplate","是否为模板","bizType","业务分类","ctime","创建日期","branchId","机构编号","categoryId","分类编号","tagIds","标签编号列表","tagNames","标签名字列表","username","创建人姓名","deptName","创建部门","groupsJson","表单元素分组","pks","主键列表，逗号分割";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -69,6 +69,12 @@ public class FormDef  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="创建部门",allowEmptyValue=true,example="",allowableValues="")
 	String deptName;
+	
+	@ApiModelProperty(notes="表单元素分组",allowEmptyValue=true,example="",allowableValues="")
+	String groupsJson;
+	
+	@ApiModelProperty(notes="主键列表，逗号分割",allowEmptyValue=true,example="",allowableValues="")
+	String pks;
 
 	/**
 	 *主键
diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml
index 4935183..581b16f 100644
--- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml
+++ b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml
@@ -80,7 +80,7 @@
 		insert into form_def(
 			<include refid="columns"/>
 		) values (
-		#{id},#{tableName},#{tableOwner},#{isCreateTable},#{formName},#{userid},#{deptid},#{formType},#{isTemplate},#{bizType},#{ctime},#{branchId},#{categoryId},#{tagIds},#{tagNames},#{username},#{deptName}
+		#{id},#{tableName},#{tableOwner},#{isCreateTable},#{formName},#{userid},#{deptid},#{formType},#{isTemplate},#{bizType},#{ctime},#{branchId},#{categoryId},#{tagIds},#{tagNames},#{username},#{deptName},#{groupsJson},#{pks}
 		)
 	</insert>
 	
@@ -155,7 +155,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		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,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,groups_json,pks
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -177,6 +177,8 @@
 		<if test="tagNames != null and tagNames != ''">      and res.tag_names = #{tagNames}     </if>
 		<if test="username != null and username != ''">      and res.username = #{username}     </if>
 		<if test="deptName != null and deptName != ''">      and res.dept_name = #{deptName}     </if>
+		<if test="groupsJson != null and groupsJson != ''">      and res.groups_json = #{groupsJson}     </if>
+		<if test="pks != null and pks != ''">      and res.pks = #{pks}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -195,7 +197,9 @@
 		tag_ids = #{tagIds},
 		tag_names = #{tagNames},
 		username = #{username},
-		dept_name = #{deptName}
+		dept_name = #{deptName},
+		groups_json = #{groupsJson},
+		pks = #{pks}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="tableName != null and tableName != ''"> table_name = #{tableName},     </if>
@@ -214,6 +218,8 @@
 		<if test="tagNames != null and tagNames != ''"> tag_names = #{tagNames},     </if>
 		<if test="username != null and username != ''"> username = #{username},     </if>
 		<if test="deptName != null and deptName != ''"> dept_name = #{deptName},     </if>
+		<if test="groupsJson != null and groupsJson != ''"> groups_json = #{groupsJson},     </if>
+		<if test="pks != null and pks != ''"> pks = #{pks},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -232,6 +238,8 @@
 			tag_ids = #{item.tagIds},
 			tag_names = #{item.tagNames},
 			username = #{item.username},
-			dept_name = #{item.deptName}
+			dept_name = #{item.deptName},
+			groups_json = #{item.groupsJson},
+			pks = #{item.pks}
 	</sql>
 </mapper>
\ No newline at end of file