diff --git a/test-test/src/main/java/com/test/test/controller/TestReportController.java b/test-test/src/main/java/com/test/test/controller/TestReportController.java index d787408..fbfae98 100644 --- a/test-test/src/main/java/com/test/test/controller/TestReportController.java +++ b/test-test/src/main/java/com/test/test/controller/TestReportController.java @@ -5,6 +5,7 @@ import com.test.common.core.controller.BaseController; import com.test.common.core.domain.AjaxResult; import com.test.common.core.page.TableDataInfo; import com.test.common.enums.BusinessType; +import com.test.test.domain.TestReport; import com.test.test.domain.qo.IDQO; import com.test.test.domain.qo.TestReportAddQO; import com.test.test.domain.vo.TestReportVo; @@ -53,4 +54,26 @@ public class TestReportController extends BaseController { public AjaxResult addTestReport(@RequestBody TestReportAddQO testReportAddQO) { return toAjax(testReportService.addTestReport(testReportAddQO)); } + + /** + * 查询测试计划关联测试报告详情 + */ + @PostMapping("/caseExecuteDetail") + public AjaxResult caseExecuteDetail(@RequestBody IDQO id) { + return success(testReportService.selectCaseTestReportById(id.getId())); + } + + /** + * 删除测试报告 + * @param id + * @return + */ + @Log(title = "测试报告", businessType = BusinessType.DELETE) + @PostMapping("/delExecuteCaseReport") + public AjaxResult delExecuteCaseReport(@RequestBody IDQO id) { + TestReport testReport = testReportService.selectCaseTestReportById(id.getId()); + testReport.setDelFlag("1"); + return toAjax(testReportService.updateExecuteCaseReport(testReport)); + } + } diff --git a/test-test/src/main/java/com/test/test/domain/vo/TestReportVo.java b/test-test/src/main/java/com/test/test/domain/vo/TestReportVo.java index 8933c3d..2c255c1 100644 --- a/test-test/src/main/java/com/test/test/domain/vo/TestReportVo.java +++ b/test-test/src/main/java/com/test/test/domain/vo/TestReportVo.java @@ -9,6 +9,9 @@ public class TestReportVo extends BaseEntity { private static final long serialVersionUID = -4331077290310280474L; + /** 测试报告id */ + private Long id; + /** * 测试报告名称 */ diff --git a/test-test/src/main/java/com/test/test/mapper/TestReportMapper.java b/test-test/src/main/java/com/test/test/mapper/TestReportMapper.java index a1bbaed..8aa297f 100644 --- a/test-test/src/main/java/com/test/test/mapper/TestReportMapper.java +++ b/test-test/src/main/java/com/test/test/mapper/TestReportMapper.java @@ -20,4 +20,18 @@ public interface TestReportMapper { * @return */ int addTestReport(TestReport testReport); + + /** + * 查询用例执行测试报告详情 + * @param id + * @return + */ + TestReport selectCaseTestReportById(Long id); + + /** + * 修改用例执行测试报告 + * @param testReport + * @return + */ + int updateExecuteCaseReport(TestReport testReport); } diff --git a/test-test/src/main/java/com/test/test/service/ITestReportService.java b/test-test/src/main/java/com/test/test/service/ITestReportService.java index dae99b2..fc898ed 100644 --- a/test-test/src/main/java/com/test/test/service/ITestReportService.java +++ b/test-test/src/main/java/com/test/test/service/ITestReportService.java @@ -24,4 +24,18 @@ public interface ITestReportService { * @return */ public int addTestReport(TestReportAddQO testReportAddQO); + + /** + * 更新执行用例测试报告 + * @param testReport + * @return + */ + public int updateExecuteCaseReport(TestReport testReport); + + /** + * 查询测试报告详情 + * @param id + * @return + */ + public TestReport selectCaseTestReportById(Long id); } diff --git a/test-test/src/main/java/com/test/test/service/impl/TestReportServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestReportServiceImpl.java index 274c1a1..7d81e1c 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestReportServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestReportServiceImpl.java @@ -90,6 +90,27 @@ public class TestReportServiceImpl implements ITestReportService { return testPlanReportMapper.insertTestPlanReport(testReportAddQO); } + /** + * 更新执行用例报告 + * @param testReport + * @return + */ + @Override + public int updateExecuteCaseReport(TestReport testReport) { + testReport.setUpdateTime(DateUtils.getNowDate()); + return testReportMapper.updateExecuteCaseReport(testReport); + } + + /** + * 根据id查询报告 + * @param id + * @return + */ + @Override + public TestReport selectCaseTestReportById(Long id) { + return testReportMapper.selectCaseTestReportById(id); + } + /** * 生成随机序列号 * @return diff --git a/test-test/src/main/resources/mapper/test/TestReportMapper.xml b/test-test/src/main/resources/mapper/test/TestReportMapper.xml index 1d7e89e..32897ee 100644 --- a/test-test/src/main/resources/mapper/test/TestReportMapper.xml +++ b/test-test/src/main/resources/mapper/test/TestReportMapper.xml @@ -31,19 +31,71 @@ + + + + + + + + + + + + + + + + SELECT id, + serial_number, + name, + result, + status, + report, + update_by, + create_time, + update_time, + version, + del_flag + FROM test_report + + + + + + + update test_report + + serial_number = #{serialNumber}, + name = #{name}, + result = #{result}, + status = #{status}, + report = #{report}, + update_by = #{updateBy}, + create_time = #{createTime}, + update_time = #{updateTime}, + version = #{version}, + del_flag = #{delFlag}, + + where id = #{id} + \ No newline at end of file diff --git a/test-ui/src/api/test/testPlan.js b/test-ui/src/api/test/testPlan.js index a1272b6..604c01c 100644 --- a/test-ui/src/api/test/testPlan.js +++ b/test-ui/src/api/test/testPlan.js @@ -9,6 +9,7 @@ const api = { testPlanProjectList: '/test/testPlanProject/list', addTestReport: 'test/testReport/addTestReport', getTestReportList: 'test/testReport/reportList', + delExecuteCaseReport: 'test/testReport/delExecuteCaseReport', getPlanOverview:'test/testPlan/planOverview', getPlanCaseTrendData: 'test/testPlan/planCaseTrendData', } @@ -77,6 +78,14 @@ export function getTestReportList(data) { }) } +export function delExecuteCaseReport(id) { + return request({ + url: api.delExecuteCaseReport, + method: 'post', + data: {id} + }) +} + export function getPlanOverview(id) { return request({ url: api.getPlanOverview, diff --git a/test-ui/src/views/test/testplan/caseReport/caseReport.vue b/test-ui/src/views/test/testplan/caseReport/caseReport.vue index a4a487d..7784d7d 100644 --- a/test-ui/src/views/test/testplan/caseReport/caseReport.vue +++ b/test-ui/src/views/test/testplan/caseReport/caseReport.vue @@ -35,6 +35,11 @@ + + +