|
@ -62,7 +62,7 @@ public class TestReportController { |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
if (!StpUtil.hasRole("admin")) { |
|
|
testReport.setCreateBy(LoginHelper.getUsername()); |
|
|
testReport.setCreateBy(LoginHelper.getUsername()); |
|
|
} |
|
|
} |
|
|
testReport.setTaskType("data_atlas"); |
|
|
|
|
|
|
|
|
// testReport.setTaskType("data_atlas"); |
|
|
QueryWrapper<TestReport> query = Wrappers.query(testReport); |
|
|
QueryWrapper<TestReport> query = Wrappers.query(testReport); |
|
|
// query.isNotNull("data_atlas"); |
|
|
// query.isNotNull("data_atlas"); |
|
|
return getCommonPage(pageQuery,query); |
|
|
return getCommonPage(pageQuery,query); |
|
@ -265,7 +265,7 @@ public class TestReportController { |
|
|
@PostMapping(value = "/uploadTestData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) |
|
|
@PostMapping(value = "/uploadTestData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) |
|
|
public R uploadTestData( @RequestPart("file") MultipartFile file, |
|
|
public R uploadTestData( @RequestPart("file") MultipartFile file, |
|
|
@RequestPart("taskName") String taskName,@RequestPart("companyName") String companyName, |
|
|
@RequestPart("taskName") String taskName,@RequestPart("companyName") String companyName, |
|
|
@RequestPart("dataAtlas") String dataAtlas,String taskDesc) { |
|
|
|
|
|
|
|
|
@RequestPart("dataAtlas") String dataAtlas,String taskDesc,@RequestPart("taskType") String taskType) { |
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(taskName)) { |
|
|
if (StrUtil.isEmpty(taskName)) { |
|
|
return R.fail("测试任务名称不能为空!"); |
|
|
return R.fail("测试任务名称不能为空!"); |
|
@ -285,7 +285,7 @@ public class TestReportController { |
|
|
testReport.setCompanyName(companyName); |
|
|
testReport.setCompanyName(companyName); |
|
|
testReport.setDataAtlas(dataAtlas); |
|
|
testReport.setDataAtlas(dataAtlas); |
|
|
testReport.setTaskDesc(taskDesc); |
|
|
testReport.setTaskDesc(taskDesc); |
|
|
testReport.setTaskType("data_atlas"); |
|
|
|
|
|
|
|
|
testReport.setTaskType(taskType); |
|
|
testReport.setCreateTime(new Date()); |
|
|
testReport.setCreateTime(new Date()); |
|
|
testReportService.save(testReport); |
|
|
testReportService.save(testReport); |
|
|
return R.ok("操作成功!"); |
|
|
return R.ok("操作成功!"); |
|
|