diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReport.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReport.java index 652ca712e8..dbb9178691 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReport.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReport.java @@ -9,8 +9,6 @@ public class TestCaseReport implements Serializable { private String name; - private String planId; - private Long startTime; private Long endTime; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportExample.java index 840e65ac12..644624f3d8 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportExample.java @@ -234,76 +234,6 @@ public class TestCaseReportExample { return (Criteria) this; } - public Criteria andPlanIdIsNull() { - addCriterion("plan_id is null"); - return (Criteria) this; - } - - public Criteria andPlanIdIsNotNull() { - addCriterion("plan_id is not null"); - return (Criteria) this; - } - - public Criteria andPlanIdEqualTo(String value) { - addCriterion("plan_id =", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdNotEqualTo(String value) { - addCriterion("plan_id <>", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdGreaterThan(String value) { - addCriterion("plan_id >", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdGreaterThanOrEqualTo(String value) { - addCriterion("plan_id >=", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdLessThan(String value) { - addCriterion("plan_id <", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdLessThanOrEqualTo(String value) { - addCriterion("plan_id <=", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdLike(String value) { - addCriterion("plan_id like", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdNotLike(String value) { - addCriterion("plan_id not like", value, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdIn(List values) { - addCriterion("plan_id in", values, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdNotIn(List values) { - addCriterion("plan_id not in", values, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdBetween(String value1, String value2) { - addCriterion("plan_id between", value1, value2, "planId"); - return (Criteria) this; - } - - public Criteria andPlanIdNotBetween(String value1, String value2) { - addCriterion("plan_id not between", value1, value2, "planId"); - return (Criteria) this; - } - public Criteria andStartTimeIsNull() { addCriterion("start_time is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplate.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplate.java index d60cb2dcad..a210ff561b 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplate.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplate.java @@ -11,10 +11,6 @@ public class TestCaseReportTemplate implements Serializable { private String workspaceId; - private Long startTime; - - private Long endTime; - private String content; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplateExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplateExample.java index 03b3616d6f..a0c5b96a60 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplateExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseReportTemplateExample.java @@ -303,126 +303,6 @@ public class TestCaseReportTemplateExample { addCriterion("workspace_id not between", value1, value2, "workspaceId"); return (Criteria) this; } - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Long value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Long value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Long value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Long value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Long value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Long value1, Long value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Long value1, Long value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Long value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Long value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Long value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Long value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Long value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Long value1, Long value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Long value1, Long value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java index c968eff1cf..772638740a 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestPlan.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestPlan.java @@ -1,8 +1,7 @@ package io.metersphere.base.domain; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; @Data public class TestPlan implements Serializable { @@ -12,6 +11,8 @@ public class TestPlan implements Serializable { private String workspaceId; + private Long reportId; + private String name; private String description; diff --git a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java index a447f69dc1..201e9701cf 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java @@ -314,6 +314,66 @@ public class TestPlanExample { return (Criteria) this; } + public Criteria andReportIdIsNull() { + addCriterion("report_id is null"); + return (Criteria) this; + } + + public Criteria andReportIdIsNotNull() { + addCriterion("report_id is not null"); + return (Criteria) this; + } + + public Criteria andReportIdEqualTo(Long value) { + addCriterion("report_id =", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotEqualTo(Long value) { + addCriterion("report_id <>", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThan(Long value) { + addCriterion("report_id >", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdGreaterThanOrEqualTo(Long value) { + addCriterion("report_id >=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThan(Long value) { + addCriterion("report_id <", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdLessThanOrEqualTo(Long value) { + addCriterion("report_id <=", value, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdIn(List values) { + addCriterion("report_id in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotIn(List values) { + addCriterion("report_id not in", values, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdBetween(Long value1, Long value2) { + addCriterion("report_id between", value1, value2, "reportId"); + return (Criteria) this; + } + + public Criteria andReportIdNotBetween(Long value1, Long value2) { + addCriterion("report_id not between", value1, value2, "reportId"); + return (Criteria) this; + } + public Criteria andNameIsNull() { addCriterion("name is null"); return (Criteria) this; diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportMapper.xml index 20e021dc4f..f4ccf620c2 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportMapper.xml @@ -4,7 +4,6 @@ - @@ -70,7 +69,7 @@ - id, name, plan_id, start_time, end_time + id, name, start_time, end_time content @@ -127,10 +126,10 @@ SELECT LAST_INSERT_ID() - insert into test_case_report (name, plan_id, start_time, - end_time, content) - values (#{name,jdbcType=VARCHAR}, #{planId,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, - #{endTime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}) + insert into test_case_report (name, start_time, end_time, + content) + values (#{name,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, + #{content,jdbcType=LONGVARCHAR}) @@ -141,9 +140,6 @@ name, - - plan_id, - start_time, @@ -158,9 +154,6 @@ #{name,jdbcType=VARCHAR}, - - #{planId,jdbcType=VARCHAR}, - #{startTime,jdbcType=BIGINT}, @@ -187,9 +180,6 @@ name = #{record.name,jdbcType=VARCHAR}, - - plan_id = #{record.planId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, @@ -208,7 +198,6 @@ update test_case_report set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, - plan_id = #{record.planId,jdbcType=VARCHAR}, start_time = #{record.startTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT}, content = #{record.content,jdbcType=LONGVARCHAR} @@ -220,7 +209,6 @@ update test_case_report set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, - plan_id = #{record.planId,jdbcType=VARCHAR}, start_time = #{record.startTime,jdbcType=BIGINT}, end_time = #{record.endTime,jdbcType=BIGINT} @@ -233,9 +221,6 @@ name = #{name,jdbcType=VARCHAR}, - - plan_id = #{planId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, @@ -251,7 +236,6 @@ update test_case_report set name = #{name,jdbcType=VARCHAR}, - plan_id = #{planId,jdbcType=VARCHAR}, start_time = #{startTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT}, content = #{content,jdbcType=LONGVARCHAR} @@ -260,7 +244,6 @@ update test_case_report set name = #{name,jdbcType=VARCHAR}, - plan_id = #{planId,jdbcType=VARCHAR}, start_time = #{startTime,jdbcType=BIGINT}, end_time = #{endTime,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportTemplateMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportTemplateMapper.xml index 13914112de..69175ac67b 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportTemplateMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseReportTemplateMapper.xml @@ -5,8 +5,6 @@ - - @@ -70,7 +68,7 @@ - id, name, workspace_id, start_time, end_time + id, name, workspace_id content @@ -127,10 +125,10 @@ SELECT LAST_INSERT_ID() - insert into test_case_report_template (name, workspace_id, start_time, - end_time, content) - values (#{name,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, - #{endTime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}) + insert into test_case_report_template (name, workspace_id, content + ) + values (#{name,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR} + ) @@ -144,12 +142,6 @@ workspace_id, - - start_time, - - - end_time, - content, @@ -161,12 +153,6 @@ #{workspaceId,jdbcType=VARCHAR}, - - #{startTime,jdbcType=BIGINT}, - - - #{endTime,jdbcType=BIGINT}, - #{content,jdbcType=LONGVARCHAR}, @@ -190,12 +176,6 @@ workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, - - start_time = #{record.startTime,jdbcType=BIGINT}, - - - end_time = #{record.endTime,jdbcType=BIGINT}, - content = #{record.content,jdbcType=LONGVARCHAR}, @@ -209,8 +189,6 @@ set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT}, content = #{record.content,jdbcType=LONGVARCHAR} @@ -220,9 +198,7 @@ update test_case_report_template set id = #{record.id,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, - workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT} + workspace_id = #{record.workspaceId,jdbcType=VARCHAR} @@ -236,12 +212,6 @@ workspace_id = #{workspaceId,jdbcType=VARCHAR}, - - start_time = #{startTime,jdbcType=BIGINT}, - - - end_time = #{endTime,jdbcType=BIGINT}, - content = #{content,jdbcType=LONGVARCHAR}, @@ -252,17 +222,13 @@ update test_case_report_template set name = #{name,jdbcType=VARCHAR}, workspace_id = #{workspaceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT}, content = #{content,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=BIGINT} update test_case_report_template set name = #{name,jdbcType=VARCHAR}, - workspace_id = #{workspaceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT} + workspace_id = #{workspaceId,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml index f91bb33a6c..d9491cf663 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml @@ -5,6 +5,7 @@ + @@ -77,8 +78,8 @@ - id, project_id, workspace_id, name, description, status, stage, principal, test_case_match_rule, - executor_match_rule, create_time, update_time + id, project_id, workspace_id, report_id, name, description, status, stage, principal, + test_case_match_rule, executor_match_rule, create_time, update_time tags @@ -133,15 +134,15 @@ insert into test_plan (id, project_id, workspace_id, - name, description, status, - stage, principal, test_case_match_rule, - executor_match_rule, create_time, update_time, - tags) + report_id, name, description, + status, stage, principal, + test_case_match_rule, executor_match_rule, create_time, + update_time, tags) values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, - #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{tags,jdbcType=LONGVARCHAR}) + #{reportId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, + #{testCaseMatchRule,jdbcType=VARCHAR}, #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, + #{updateTime,jdbcType=BIGINT}, #{tags,jdbcType=LONGVARCHAR}) insert into test_plan @@ -155,6 +156,9 @@ workspace_id, + + report_id, + name, @@ -196,6 +200,9 @@ #{workspaceId,jdbcType=VARCHAR}, + + #{reportId,jdbcType=BIGINT}, + #{name,jdbcType=VARCHAR}, @@ -246,6 +253,9 @@ workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, + + report_id = #{record.reportId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, @@ -286,6 +296,7 @@ set id = #{record.id,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, + report_id = #{record.reportId,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, status = #{record.status,jdbcType=VARCHAR}, @@ -305,6 +316,7 @@ set id = #{record.id,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, + report_id = #{record.reportId,jdbcType=BIGINT}, name = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, status = #{record.status,jdbcType=VARCHAR}, @@ -327,6 +339,9 @@ workspace_id = #{workspaceId,jdbcType=VARCHAR}, + + report_id = #{reportId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, @@ -364,6 +379,7 @@ update test_plan set project_id = #{projectId,jdbcType=VARCHAR}, workspace_id = #{workspaceId,jdbcType=VARCHAR}, + report_id = #{reportId,jdbcType=BIGINT}, name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, status = #{status,jdbcType=VARCHAR}, @@ -380,6 +396,7 @@ update test_plan set project_id = #{projectId,jdbcType=VARCHAR}, workspace_id = #{workspaceId,jdbcType=VARCHAR}, + report_id = #{reportId,jdbcType=BIGINT}, name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, status = #{status,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/metersphere/service/TestCaseReportService.java b/backend/src/main/java/io/metersphere/service/TestCaseReportService.java index 605234c43e..3cd5961fc5 100644 --- a/backend/src/main/java/io/metersphere/service/TestCaseReportService.java +++ b/backend/src/main/java/io/metersphere/service/TestCaseReportService.java @@ -22,9 +22,6 @@ public class TestCaseReportService { if ( StringUtils.isNotBlank(request.getName()) ) { example.createCriteria().andNameEqualTo(request.getName()); } - if ( StringUtils.isNotBlank(request.getPlanId()) ) { - example.createCriteria().andPlanIdEqualTo(request.getPlanId()); - } return testCaseReportMapper.selectByExample(example); } diff --git a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql index c947098fd3..fb5a030e6f 100644 --- a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql @@ -260,6 +260,7 @@ CREATE TABLE IF NOT EXISTS `test_plan` ( `id` varchar(50) NOT NULL COMMENT 'Test Plan ID', `project_id` varchar(50) NOT NULL COMMENT 'Project ID this plan belongs to', `workspace_id` varchar(50) NOT NULL COMMENT 'Workspace ID this plan belongs to', + `report_id` bigint(20) COMMENT 'Test plan report', `name` varchar(64) NOT NULL COMMENT 'Plan name', `description` varchar(255) DEFAULT NULL COMMENT 'Plan description', `status` varchar(20) NOT NULL COMMENT 'Plan status', @@ -335,8 +336,6 @@ CREATE TABLE IF NOT EXISTS `test_case_report_template` ( `name` varchar(64) NOT NULL COMMENT 'Test case report template name', `workspace_id` varchar(50) DEFAULT NULL COMMENT 'Workspace ID this project belongs to', `content` longtext COMMENT 'Template content (JSON format)', - `start_time` bigint(13) COMMENT 'Test start time', - `end_time` bigint(13) COMMENT 'Test end time', PRIMARY KEY (`id`) ) ENGINE=InnoDB @@ -346,7 +345,6 @@ CREATE TABLE IF NOT EXISTS `test_case_report_template` ( CREATE TABLE IF NOT EXISTS `test_case_report` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `name` varchar(64) NOT NULL COMMENT 'Test case report name', - `plan_id` varchar(50) NOT NULL COMMENT 'Plan ID relation to', `content` longtext COMMENT 'Report content (JSON format)', `start_time` bigint(13) COMMENT 'Test start time', `end_time` bigint(13) COMMENT 'Test end time', diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 7649cf5a1d..3627992fc2 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -59,13 +59,15 @@ - - -
+
+ + +
+ \ No newline at end of file diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue index 07d4c77d85..61bad9ab30 100644 --- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue @@ -11,6 +11,7 @@ + @@ -93,7 +94,6 @@ @@ -279,6 +279,9 @@ filter(value, row, column) { const property = column['property']; return row[property] === value; + }, + openTestReport() { + } } }