From bed8e374d20bae73c9cb297d812b6b42b791fcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 4 Aug 2022 09:21:02 +0800 Subject: [PATCH] rptConfig --- .../java/com/xm/core/entity/XmTestPlan.java | 12 ++++++++++- .../mapper/xm/core/dao/XmTestPlanMapper.xml | 20 +++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) 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 6bf3e96e..d382006f 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 @@ -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 小模块
* 实体 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-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数";
+ * "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","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结";
* 当前主键(包括多主键):
* id;
*/ @@ -102,6 +103,15 @@ public class XmTestPlan implements java.io.Serializable { @ApiModelProperty(notes="功能模块数",allowEmptyValue=true,example="",allowableValues="") Integer funcs; + + @ApiModelProperty(notes="预算工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal budgetWorkload; + + @ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="") + BigDecimal actWorkload; + + @ApiModelProperty(notes="报告总结",allowEmptyValue=true,example="",allowableValues="") + String summaryRemark; /** *测试计划编号 diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml index 97611262..ad1f766f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml @@ -67,7 +67,7 @@ insert into xm_test_plan( ) values ( - #{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs} + #{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark} ) @@ -142,7 +142,7 @@ - id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs + id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark @@ -175,6 +175,9 @@ and res.confirmed_bugs = #{confirmedBugs} and res.menus = #{menus} and res.funcs = #{funcs} + and res.budget_workload = #{budgetWorkload} + and res.act_workload = #{actWorkload} + and res.summary_remark = #{summaryRemark} @@ -204,7 +207,10 @@ active_bugs = #{activeBugs}, confirmed_bugs = #{confirmedBugs}, menus = #{menus}, - funcs = #{funcs} + funcs = #{funcs}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + summary_remark = #{summaryRemark} name = #{name}, @@ -234,6 +240,9 @@ confirmed_bugs = #{confirmedBugs}, menus = #{menus}, funcs = #{funcs}, + budget_workload = #{budgetWorkload}, + act_workload = #{actWorkload}, + summary_remark = #{summaryRemark}, @@ -263,6 +272,9 @@ active_bugs = #{item.activeBugs}, confirmed_bugs = #{item.confirmedBugs}, menus = #{item.menus}, - funcs = #{item.funcs} + funcs = #{item.funcs}, + budget_workload = #{item.budgetWorkload}, + act_workload = #{item.actWorkload}, + summary_remark = #{item.summaryRemark} \ No newline at end of file