bug

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","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割";<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","上级菜单名称列表逗号分割","preRemark","前置条件描述";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -91,6 +91,9 @@ public class XmTestCase  implements java.io.Serializable {
 	@ApiModelProperty(notes="上级菜单名称列表逗号分割",allowEmptyValue=true,example="",allowableValues="")
 	String funcPnames;
 	
+	@ApiModelProperty(notes="前置条件描述",allowEmptyValue=true,example="",allowableValues="")
+	String preRemark;
+
 	/**
 	 *主键
 	 **/

xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java

@@ -8,7 +8,7 @@ import java.util.Date;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestPlanCase所有属性名: <br>
- *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","planId","计划编号","caseName","用例名称","priority","优先级","remark","执行备注","testStep","测试步骤";<br>
+ *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号";<br>
  * 当前主键(包括多主键):<br>
  *	case_id,plan_id;<br>
  */
@@ -43,9 +43,6 @@ public class XmTestPlanCase  implements java.io.Serializable {
 	@ApiModelProperty(notes="执行人姓名",allowEmptyValue=true,example="",allowableValues="")
 	String execUsername;
 	
-	@ApiModelProperty(notes="用例名称",allowEmptyValue=true,example="",allowableValues="")
-	String caseName;
-	
 	@ApiModelProperty(notes="优先级",allowEmptyValue=true,example="",allowableValues="")
 	String priority;
 	

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},#{funcId},#{funcName},#{funcPnames}
+		#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames},#{preRemark}
 		)
 	</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,func_id,func_name,func_pnames
+		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,pre_remark
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -193,6 +193,7 @@
 		<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>
+		<if test="preRemark != null and preRemark != ''">      and res.pre_remark = #{preRemark}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -218,7 +219,8 @@
 		casedb_name = #{casedbName},
 		func_id = #{funcId},
 		func_name = #{funcName},
-		func_pnames = #{funcPnames}
+		func_pnames = #{funcPnames},
+		pre_remark = #{preRemark}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="caseName != null and caseName != ''"> case_name = #{caseName},     </if>
@@ -244,6 +246,7 @@
 		<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>
+		<if test="preRemark != null and preRemark != ''"> pre_remark = #{preRemark},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -269,6 +272,7 @@
 			casedb_name = #{item.casedbName},
 			func_id = #{item.funcId},
 			func_name = #{item.funcName},
-			func_pnames = #{item.funcPnames}
+			func_pnames = #{item.funcPnames},
+			pre_remark = #{item.preRemark}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml

@@ -76,7 +76,7 @@
 		insert into xm_test_plan_case(
 			<include refid="columns"/>
 		) values (
-		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{planId},#{caseName},#{priority},#{remark},#{testStep}
+		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId}
 		)
 	</insert>
 	
@@ -151,7 +151,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,plan_id,case_name,priority,remark,test_step
+		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -163,11 +163,10 @@
 		<if test="ctime != null">      and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d')     </if>
 		<if test="execStatus != null and execStatus != ''">      and res.exec_status = #{execStatus}     </if>
 		<if test="execUsername != null and execUsername != ''">      and res.exec_username = #{execUsername}     </if>
-		<if test="planId != null and planId != ''">      and res.plan_id = #{planId}     </if>
-		<if test="caseName != null and caseName != ''">      and res.case_name = #{caseName}     </if>
 		<if test="priority != null and priority != ''">      and res.priority = #{priority}     </if>
 		<if test="remark != null and remark != ''">      and res.remark = #{remark}     </if>
 		<if test="testStep != null and testStep != ''">      and res.test_step = #{testStep}     </if>
+		<if test="planId != null and planId != ''">      and res.plan_id = #{planId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -177,7 +176,6 @@
 		ctime = #{ctime},
 		exec_status = #{execStatus},
 		exec_username = #{execUsername},
-		case_name = #{caseName},
 		priority = #{priority},
 		remark = #{remark},
 		test_step = #{testStep}
@@ -189,7 +187,6 @@
 		<if test="ctime != null"> ctime = #{ctime},     </if>
 		<if test="execStatus != null and execStatus != ''"> exec_status = #{execStatus},     </if>
 		<if test="execUsername != null and execUsername != ''"> exec_username = #{execUsername},     </if>
-		<if test="caseName != null and caseName != ''"> case_name = #{caseName},     </if>
 		<if test="priority != null and priority != ''"> priority = #{priority},     </if>
 		<if test="remark != null and remark != ''"> remark = #{remark},     </if>
 		<if test="testStep != null and testStep != ''"> test_step = #{testStep},     </if>
@@ -202,7 +199,6 @@
 			ctime = #{item.ctime},
 			exec_status = #{item.execStatus},
 			exec_username = #{item.execUsername},
-			case_name = #{item.caseName},
 			priority = #{item.priority},
 			remark = #{item.remark},
 			test_step = #{item.testStep}