历史报表

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestCase所有属性名: <br>
- *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态0-草稿，1-评审中，2-审核通过，3-审核未通过，4-废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型-与bug类型相同","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","retest","是否可作为回归测试用例0-否，1-是","pbranchId","产品归属企业","testType","测试方式0-手工，1-自动";<br>
+ *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态0-草稿，1-评审中，2-审核通过，3-审核未通过，4-废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型-与bug类型相同","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","retest","是否可作为回归测试用例0-否，1-是","pbranchId","产品归属企业","testType","测试方式0-手工，1-自动","autoStep","自动化测试步骤：";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -118,6 +118,9 @@ public class XmTestCase  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="测试方式0-手工，1-自动",allowEmptyValue=true,example="",allowableValues="")
 	String testType;
+	
+	@ApiModelProperty(notes="自动化测试步骤：",allowEmptyValue=true,example="",allowableValues="")
+	String autoStep;
 
 	/**
 	 *主键

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

@@ -100,7 +100,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},#{preRemark},#{caseType},#{cpriority},#{budgetWorkload},#{actWorkload},#{initWorkload},#{retest},#{pbranchId},#{testType}
+		#{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},#{caseType},#{cpriority},#{budgetWorkload},#{actWorkload},#{initWorkload},#{retest},#{pbranchId},#{testType},#{autoStep}
 		)
 	</insert>
 	
@@ -175,7 +175,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,pre_remark,case_type,cpriority,budget_workload,act_workload,init_workload,retest,pbranch_id,test_type
+		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,case_type,cpriority,budget_workload,act_workload,init_workload,retest,pbranch_id,test_type,auto_step
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -213,6 +213,7 @@
 		<if test="retest != null and retest != ''">      and res.retest = #{retest}     </if>
 		<if test="pbranchId != null and pbranchId != ''">      and res.pbranch_id = #{pbranchId}     </if>
 		<if test="testType != null and testType != ''">      and res.test_type = #{testType}     </if>
+		<if test="autoStep != null and autoStep != ''">      and res.auto_step = #{autoStep}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -247,7 +248,8 @@
 		init_workload = #{initWorkload},
 		retest = #{retest},
 		pbranch_id = #{pbranchId},
-		test_type = #{testType}
+		test_type = #{testType},
+		auto_step = #{autoStep}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="caseName != null and caseName != ''"> case_name = #{caseName},     </if>
@@ -282,6 +284,7 @@
 		<if test="retest != null and retest != ''"> retest = #{retest},     </if>
 		<if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId},     </if>
 		<if test="testType != null and testType != ''"> test_type = #{testType},     </if>
+		<if test="autoStep != null and autoStep != ''"> auto_step = #{autoStep},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -316,6 +319,7 @@
 			init_workload = #{item.initWorkload},
 			retest = #{item.retest},
 			pbranch_id = #{item.pbranchId},
-			test_type = #{item.testType}
+			test_type = #{item.testType},
+			auto_step = #{item.autoStep}
 	</sql>
 </mapper>