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 0e305dd2..48961228 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 @@ -4,11 +4,12 @@ import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTestCase所有属性名:
- * "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","前置条件描述","caseType","用例类型","cpriority","优先级";
+ * "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","前置条件描述","caseType","用例类型","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时";
* 当前主键(包括多主键):
* id;
*/ @@ -99,6 +100,15 @@ public class XmTestCase implements java.io.Serializable { @ApiModelProperty(notes="优先级",allowEmptyValue=true,example="",allowableValues="") String cpriority; + + @ApiModelProperty(notes="预算工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal budgetWorkload; + + @ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal actWorkload; + + @ApiModelProperty(notes="原估工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal initWorkload; /** *主键 diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java index 21a74cca..c82806f3 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java @@ -4,11 +4,12 @@ import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTestPlanCase所有属性名:
- * "bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测,1-通过,2-受阻,3-忽略,4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号";
+ * "bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测,1-通过,2-受阻,3-忽略,4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时";
* 当前主键(包括多主键):
* case_id,plan_id;
*/ @@ -54,6 +55,15 @@ public class XmTestPlanCase implements java.io.Serializable { @ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="") String projectId; + + @ApiModelProperty(notes="预算工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal budgetWorkload; + + @ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal actWorkload; + + @ApiModelProperty(notes="原估工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal initWorkload; /** *测试用例编号,计划编号 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 ad830c5d..f547a5ee 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( ) 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} + #{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} ) @@ -164,7 +164,7 @@ - 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 + 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 @@ -196,6 +196,9 @@ and res.pre_remark = #{preRemark} and res.case_type = #{caseType} and res.cpriority = #{cpriority} + and res.budget_workload = #{budgetWorkload} + and res.act_workload = #{actWorkload} + and res.init_workload = #{initWorkload} @@ -224,7 +227,10 @@ func_pnames = #{funcPnames}, pre_remark = #{preRemark}, case_type = #{caseType}, - cpriority = #{cpriority} + cpriority = #{cpriority}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + init_workload = #{initWorkload} case_name = #{caseName}, @@ -253,6 +259,9 @@ pre_remark = #{preRemark}, case_type = #{caseType}, cpriority = #{cpriority}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + init_workload = #{initWorkload}, @@ -281,6 +290,9 @@ func_pnames = #{item.funcPnames}, pre_remark = #{item.preRemark}, case_type = #{item.caseType}, - cpriority = #{item.cpriority} + cpriority = #{item.cpriority}, + budget_workload = #{item.budgetWorkload}, + act_workload = #{item.actWorkload}, + init_workload = #{item.initWorkload} \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml index c92eeab2..03ad725c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml @@ -94,7 +94,7 @@ insert into xm_test_plan_case( ) values ( - #{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId} + #{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload} ) @@ -169,7 +169,7 @@ - bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id + bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload @@ -186,6 +186,9 @@ and res.test_step = #{testStep} and res.plan_id = #{planId} and res.project_id = #{projectId} + and res.budget_workload = #{budgetWorkload} + and res.act_workload = #{actWorkload} + and res.init_workload = #{initWorkload} @@ -198,7 +201,10 @@ priority = #{priority}, remark = #{remark}, test_step = #{testStep}, - project_id = #{projectId} + project_id = #{projectId}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + init_workload = #{initWorkload} bugs = #{bugs}, @@ -211,6 +217,9 @@ remark = #{remark}, test_step = #{testStep}, project_id = #{projectId}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + init_workload = #{initWorkload}, @@ -223,6 +232,9 @@ priority = #{item.priority}, remark = #{item.remark}, test_step = #{item.testStep}, - project_id = #{item.projectId} + project_id = #{item.projectId}, + budget_workload = #{item.budgetWorkload}, + act_workload = #{item.actWorkload}, + init_workload = #{item.initWorkload} \ No newline at end of file