From 8126ccaf9b7e105b7128b4428d8c57c15aedd592 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, 19 Jul 2022 18:39:07 +0800
Subject: [PATCH] bug

---
 .../java/com/xm/core/entity/XmTestCase.java   | 11 +++++++++-
 .../mapper/xm/core/dao/XmTestCaseMapper.xml   | 20 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
index e81404e1..9d511bce 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestCase所有属性名: <br>
- *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态1正常0废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称";<br>
+ *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态1正常0废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -81,6 +81,15 @@ public class XmTestCase  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="用例库名称",allowEmptyValue=true,example="",allowableValues="")
 	String casedbName;
+	
+	@ApiModelProperty(notes="功能菜单编号",allowEmptyValue=true,example="",allowableValues="")
+	String funcId;
+	
+	@ApiModelProperty(notes="功能菜单名称",allowEmptyValue=true,example="",allowableValues="")
+	String funcName;
+	
+	@ApiModelProperty(notes="上级菜单名称列表逗号分割",allowEmptyValue=true,example="",allowableValues="")
+	String funcPnames;
 
 	/**
 	 *主键
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
index bd1c368c..4043ee63 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
@@ -89,7 +89,7 @@
 		insert into xm_test_case(
 			<include refid="columns"/>
 		) values (
-		#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName}
+		#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames}
 		)
 	</insert>
 	
@@ -164,7 +164,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name
+		id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name,func_id,func_name,func_pnames
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -190,6 +190,9 @@
 		<if test="verNum != null and verNum != ''">      and res.ver_num = #{verNum}     </if>
 		<if test="casedbId != null and casedbId != ''">      and res.casedb_id = #{casedbId}     </if>
 		<if test="casedbName != null and casedbName != ''">      and res.casedb_name = #{casedbName}     </if>
+		<if test="funcId != null and funcId != ''">      and res.func_id = #{funcId}     </if>
+		<if test="funcName != null and funcName != ''">      and res.func_name = #{funcName}     </if>
+		<if test="funcPnames != null and funcPnames != ''">      and res.func_pnames = #{funcPnames}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -212,7 +215,10 @@
 		product_id = #{productId},
 		ver_num = #{verNum},
 		casedb_id = #{casedbId},
-		casedb_name = #{casedbName}
+		casedb_name = #{casedbName},
+		func_id = #{funcId},
+		func_name = #{funcName},
+		func_pnames = #{funcPnames}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="caseName != null and caseName != ''"> case_name = #{caseName},     </if>
@@ -235,6 +241,9 @@
 		<if test="verNum != null and verNum != ''"> ver_num = #{verNum},     </if>
 		<if test="casedbId != null and casedbId != ''"> casedb_id = #{casedbId},     </if>
 		<if test="casedbName != null and casedbName != ''"> casedb_name = #{casedbName},     </if>
+		<if test="funcId != null and funcId != ''"> func_id = #{funcId},     </if>
+		<if test="funcName != null and funcName != ''"> func_name = #{funcName},     </if>
+		<if test="funcPnames != null and funcPnames != ''"> func_pnames = #{funcPnames},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -257,6 +266,9 @@
 			product_id = #{item.productId},
 			ver_num = #{item.verNum},
 			casedb_id = #{item.casedbId},
-			casedb_name = #{item.casedbName}
+			casedb_name = #{item.casedbName},
+			func_id = #{item.funcId},
+			func_name = #{item.funcName},
+			func_pnames = #{item.funcPnames}
 	</sql>
 </mapper>
\ No newline at end of file