From 3c405e916b9136fdea2375e53a902618f9980470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 19 Feb 2023 18:09:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/entity/XmTestPlan.java | 5 ++++- .../main/java/com/xm/core/entity/XmTestPlanCase.java | 5 ++++- .../mapper/xm/core/dao/XmTestPlanCaseMapper.xml | 12 ++++++++---- .../mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml | 12 ++++++++---- 4 files changed, 24 insertions(+), 10 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 161a6e17..851a488b 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 @@ -9,7 +9,7 @@ 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","阻塞用例数","toTestCases","未测用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","pbranchId","产品归属企业","ptype","计划类型0-普通测试，2-迭代测试，1-发布测试，","envJson","环境变量列表";
+ * "id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","toTestCases","未测用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","pbranchId","产品归属企业","ptype","计划类型0-普通测试，2-迭代测试，1-发布测试，","envJson","环境变量列表","testType","测试方式0-手工，1-自动";
* 当前主键(包括多主键):
* id;
*/ @@ -127,6 +127,9 @@ public class XmTestPlan implements java.io.Serializable { @ApiModelProperty(notes="环境变量列表",allowEmptyValue=true,example="",allowableValues="") String envJson; + + @ApiModelProperty(notes="测试方式0-手工，1-自动",allowEmptyValue=true,example="",allowableValues="") + String testType; /** *测试计划编号 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 18940346..b29fa1f4 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 @@ -9,7 +9,7 @@ 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","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型","execType","执行类型0-手工，1-自动化","productId","归属产品";
+ * "bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型","execType","执行类型0-手工，1-自动化","productId","归属产品","autoStep","自动化测试";
* 当前主键(包括多主键):
* case_id,plan_id;
*/ @@ -73,6 +73,9 @@ public class XmTestPlanCase implements java.io.Serializable { @ApiModelProperty(notes="归属产品",allowEmptyValue=true,example="",allowableValues="") String productId; + + @ApiModelProperty(notes="自动化测试",allowEmptyValue=true,example="",allowableValues="") + String autoStep; /** *测试用例编号,计划编号 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 e7608af4..6f442350 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 @@ -199,7 +199,7 @@ insert into xm_test_plan_case( ) values ( - #{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate},#{execType},#{productId} + #{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate},#{execType},#{productId},#{autoStep} ) @@ -274,7 +274,7 @@ - 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,exec_date,exec_type,product_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,exec_date,exec_type,product_id,auto_step @@ -297,6 +297,7 @@ and res.exec_date = #{execDate} and res.exec_type = #{execType} and res.product_id = #{productId} + and res.auto_step = #{autoStep} @@ -315,7 +316,8 @@ init_workload = #{initWorkload}, exec_date = #{execDate}, exec_type = #{execType}, - product_id = #{productId} + product_id = #{productId}, + auto_step = #{autoStep} bugs = #{bugs}, @@ -334,6 +336,7 @@ exec_date = #{execDate}, exec_type = #{execType}, product_id = #{productId}, + auto_step = #{autoStep}, @@ -352,6 +355,7 @@ init_workload = #{item.initWorkload}, exec_date = #{item.execDate}, exec_type = #{item.execType}, - product_id = #{item.productId} + product_id = #{item.productId}, + auto_step = #{item.autoStep} \ No newline at end of file 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 d3a0f69b..5997840b 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 @@ -132,7 +132,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},#{toTestCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{pbranchId},#{ptype},#{envJson} + #{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{toTestCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{pbranchId},#{ptype},#{envJson},#{testType} ) @@ -207,7 +207,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,to_test_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,cbranch_id,pbranch_id,ptype,env_json + 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,to_test_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,cbranch_id,pbranch_id,ptype,env_json,test_type @@ -248,6 +248,7 @@ and res.pbranch_id = #{pbranchId} and res.ptype = #{ptype} and res.env_json = #{envJson} + and res.test_type = #{testType} @@ -285,7 +286,8 @@ cbranch_id = #{cbranchId}, pbranch_id = #{pbranchId}, ptype = #{ptype}, - env_json = #{envJson} + env_json = #{envJson}, + test_type = #{testType} name = #{name}, @@ -323,6 +325,7 @@ pbranch_id = #{pbranchId}, ptype = #{ptype}, env_json = #{envJson}, + test_type = #{testType}, @@ -360,6 +363,7 @@ cbranch_id = #{item.cbranchId}, pbranch_id = #{item.pbranchId}, ptype = #{item.ptype}, - env_json = #{item.envJson} + env_json = #{item.envJson}, + test_type = #{item.testType} \ No newline at end of file