diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
index aab30f2c..7827ae00 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmQuestion所有属性名:
- * "id","问题编号","name","问题标题","projectId","项目编号","projectName","项目名称","caseId","测试案例编号","caseName","测试案例名称","endTime","到期时间","askUserid","提出人编号","askUsername","提出人","handlerUserid","处理人编号","handlerUsername","处理人","priority","优先级别1-非常紧急，2-紧急，3-一般紧急，4-低","solution","解决方案:","description","问题描述","createUserid","问题创建人编号","createUsername","问题创建人","createTime","创建时间","bugStatus","bug状态1|新提交2|处理中3|已修复4|重新打开5|已发布6|已拒绝7|挂起","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","menuId","故事编号","menuName","故事名称","budgetWorkload","预估工时单位人时","budgetAt","预估成本金额","actWorkload","实际工时（取报工实际工时汇总）","actAt","实际总金额","expectResult","期望结果","opStep","操作步骤","currResult","当前结果","refRequire","相关需求","bugSeverity","严重程度1、2、3、4，分别对应：致命缺陷、严重缺陷、普通缺陷、轻微缺陷","bugType","BUG类型1、2、3、4，分别对应：代码错误、低级缺陷、设计缺陷、配置相关、安全相关、性能问题、其他","tagIds","标签id列表逗号分隔","tagNames","标签名称列表逗号分隔","urls","链接地址列表逗号分隔","ltime","最后更新时间","qtype","问题类型2-风险、1-功能问题、3-普通咨询、（暂时不用这个字段了）","caseExecId","关联的案例执行编号","remarks","最后更新说明","productId","产品编号","repRate","复现频率1-必现，2-大概率复现，3-小概率复现，4-仅出现一次","verNum","版本号","vpath","访问路径/斜杠分割","pverNum","发布版本","bugReason","原因分析","rate","进度0-100","initWorkload","原始预估工作量，budget_workload发生变化后，进行备份","taskOut","是否众包0否1是","taskId","任务编号-可以在任务下直接创建bug";
+ * "id","问题编号","name","问题标题","projectId","项目编号","projectName","项目名称","caseId","测试案例编号","caseName","测试案例名称","endTime","到期时间","askUserid","提出人编号","askUsername","提出人","handlerUserid","处理人编号","handlerUsername","处理人","priority","优先级别1-非常紧急，2-紧急，3-一般紧急，4-低","solution","解决方案:","description","问题描述","createUserid","问题创建人编号","createUsername","问题创建人","createTime","创建时间","bugStatus","bug状态1|新提交2|处理中3|已修复4|重新打开5|已发布6|已拒绝7|挂起","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","menuId","故事编号","menuName","故事名称","budgetWorkload","预估工时单位人时","budgetAt","预估成本金额","actWorkload","实际工时（取报工实际工时汇总）","actAt","实际总金额","expectResult","期望结果","opStep","测试步骤","currResult","当前结果","refRequire","相关需求","bugSeverity","严重程度1、2、3、4，分别对应：致命缺陷、严重缺陷、普通缺陷、轻微缺陷","bugType","BUG类型1、2、3、4，分别对应：代码错误、低级缺陷、设计缺陷、配置相关、安全相关、性能问题、其他","tagIds","标签id列表逗号分隔","tagNames","标签名称列表逗号分隔","urls","链接地址列表逗号分隔","ltime","最后更新时间","qtype","问题类型2-风险、1-功能问题、3-普通咨询、（暂时不用这个字段了）","caseExecId","关联的案例执行编号","remarks","最后更新说明","productId","产品编号","repRate","复现频率1-必现，2-大概率复现，3-小概率复现，4-仅出现一次","verNum","版本号","vpath","访问路径/斜杠分割","pverNum","发布版本","bugReason","原因分析","rate","进度0-100","initWorkload","原始预估工作量，budget_workload发生变化后，进行备份","taskOut","是否众包0否1是","taskId","任务编号-可以在任务下直接创建bug","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级名称逗号分割","planId","测试计划编号","casedbId","测试库编号";
* 当前主键(包括多主键):
* id;
*/
@@ -101,7 +101,7 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="")
String expectResult;
- @ApiModelProperty(notes="操作步骤",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="测试步骤",allowEmptyValue=true,example="",allowableValues="")
String opStep;
@ApiModelProperty(notes="当前结果",allowEmptyValue=true,example="",allowableValues="")
@@ -166,6 +166,21 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="任务编号-可以在任务下直接创建bug",allowEmptyValue=true,example="",allowableValues="")
String taskId;
+
+ @ApiModelProperty(notes="功能菜单编号",allowEmptyValue=true,example="",allowableValues="")
+ String funcId;
+
+ @ApiModelProperty(notes="功能菜单名称",allowEmptyValue=true,example="",allowableValues="")
+ String funcName;
+
+ @ApiModelProperty(notes="上级名称逗号分割",allowEmptyValue=true,example="",allowableValues="")
+ String funcPnames;
+
+ @ApiModelProperty(notes="测试计划编号",allowEmptyValue=true,example="",allowableValues="")
+ String planId;
+
+ @ApiModelProperty(notes="测试库编号",allowEmptyValue=true,example="",allowableValues="")
+ String casedbId;
/**
*问题编号
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 f4b48c29..0e305dd2 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 小模块
* 实体 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","前置条件描述";
+ * "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;
*/
@@ -93,6 +93,12 @@ public class XmTestCase implements java.io.Serializable {
@ApiModelProperty(notes="前置条件描述",allowEmptyValue=true,example="",allowableValues="")
String preRemark;
+
+ @ApiModelProperty(notes="用例类型",allowEmptyValue=true,example="",allowableValues="")
+ String caseType;
+
+ @ApiModelProperty(notes="优先级",allowEmptyValue=true,example="",allowableValues="")
+ String cpriority;
/**
*主键
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java b/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
index c63d4235..6bf3e96e 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
@@ -8,7 +8,7 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTestPlan所有属性名:
- * "id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝";
+ * "id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数";
* 当前主键(包括多主键):
* id;
*/
@@ -81,6 +81,27 @@ public class XmTestPlan implements java.io.Serializable {
@ApiModelProperty(notes="评审结果0-待评审，1-已评审通过，2-已拒绝",allowEmptyValue=true,example="",allowableValues="")
String flowState;
+
+ @ApiModelProperty(notes="bug数目",allowEmptyValue=true,example="",allowableValues="")
+ Integer bugCnt;
+
+ @ApiModelProperty(notes="已关闭bug总数",allowEmptyValue=true,example="",allowableValues="")
+ Integer closedBugs;
+
+ @ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+ Integer resolvedBugs;
+
+ @ApiModelProperty(notes="激活的bug总数",allowEmptyValue=true,example="",allowableValues="")
+ Integer activeBugs;
+
+ @ApiModelProperty(notes="已解决bug总数",allowEmptyValue=true,example="",allowableValues="")
+ Integer confirmedBugs;
+
+ @ApiModelProperty(notes="需求数目",allowEmptyValue=true,example="",allowableValues="")
+ Integer menus;
+
+ @ApiModelProperty(notes="功能模块数",allowEmptyValue=true,example="",allowableValues="")
+ Integer funcs;
/**
*测试计划编号
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
index 17f5c985..255bd863 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
@@ -121,7 +121,7 @@
insert into xm_question(
) values (
- #{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetAt},#{actWorkload},#{actAt},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{initWorkload},#{taskOut},#{taskId}
+ #{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetAt},#{actWorkload},#{actAt},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{initWorkload},#{taskOut},#{taskId},#{funcId},#{funcName},#{funcPnames},#{planId},#{casedbId}
)
@@ -196,7 +196,7 @@
- id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_at,act_workload,act_at,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload,task_out,task_id
+ id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_at,act_workload,act_at,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload,task_out,task_id,func_id,func_name,func_pnames,plan_id,casedb_id
@@ -250,6 +250,11 @@
and res.init_workload = #{initWorkload}
and res.task_out = #{taskOut}
and res.task_id = #{taskId}
+ and res.func_id = #{funcId}
+ and res.func_name = #{funcName}
+ and res.func_pnames = #{funcPnames}
+ and res.plan_id = #{planId}
+ and res.casedb_id = #{casedbId}
@@ -300,7 +305,12 @@
rate = #{rate},
init_workload = #{initWorkload},
task_out = #{taskOut},
- task_id = #{taskId}
+ task_id = #{taskId},
+ func_id = #{funcId},
+ func_name = #{funcName},
+ func_pnames = #{funcPnames},
+ plan_id = #{planId},
+ casedb_id = #{casedbId}
name = #{name},
@@ -351,6 +361,11 @@
init_workload = #{initWorkload},
task_out = #{taskOut},
task_id = #{taskId},
+ func_id = #{funcId},
+ func_name = #{funcName},
+ func_pnames = #{funcPnames},
+ plan_id = #{planId},
+ casedb_id = #{casedbId},
@@ -401,6 +416,11 @@
rate = #{item.rate},
init_workload = #{item.initWorkload},
task_out = #{item.taskOut},
- task_id = #{item.taskId}
+ task_id = #{item.taskId},
+ func_id = #{item.funcId},
+ func_name = #{item.funcName},
+ func_pnames = #{item.funcPnames},
+ plan_id = #{item.planId},
+ casedb_id = #{item.casedbId}
\ No newline at end of file
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 7b382be6..dbb71d4f 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}
+ #{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}
)
@@ -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
+ 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
@@ -194,6 +194,8 @@
and res.func_name = #{funcName}
and res.func_pnames = #{funcPnames}
and res.pre_remark = #{preRemark}
+ and res.case_type = #{caseType}
+ and res.cpriority = #{cpriority}
@@ -220,7 +222,9 @@
func_id = #{funcId},
func_name = #{funcName},
func_pnames = #{funcPnames},
- pre_remark = #{preRemark}
+ pre_remark = #{preRemark},
+ case_type = #{caseType},
+ cpriority = #{cpriority}
case_name = #{caseName},
@@ -247,6 +251,8 @@
func_name = #{funcName},
func_pnames = #{funcPnames},
pre_remark = #{preRemark},
+ case_type = #{caseType},
+ cpriority = #{cpriority},
@@ -273,6 +279,8 @@
func_id = #{item.funcId},
func_name = #{item.funcName},
func_pnames = #{item.funcPnames},
- pre_remark = #{item.preRemark}
+ pre_remark = #{item.preRemark},
+ case_type = #{item.caseType},
+ cpriority = #{item.cpriority}
\ 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 8d8ee367..090712e1 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
@@ -28,7 +28,7 @@