Commit d13cedd8 authored by 高滢's avatar 高滢

样品管理 分页查询报错修改

parent 3aecfc37
...@@ -7,6 +7,7 @@ import com.ruoyi.domain.Sample; ...@@ -7,6 +7,7 @@ import com.ruoyi.domain.Sample;
import com.ruoyi.domain.TestScenario; import com.ruoyi.domain.TestScenario;
import com.ruoyi.service.ITestScenarioService; import com.ruoyi.service.ITestScenarioService;
import com.ruoyi.web.request.TestScenarioRequest; import com.ruoyi.web.request.TestScenarioRequest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.skywalking.apm.toolkit.trace.Tag; import org.apache.skywalking.apm.toolkit.trace.Tag;
import org.apache.skywalking.apm.toolkit.trace.Tags; import org.apache.skywalking.apm.toolkit.trace.Tags;
...@@ -20,10 +21,12 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -20,10 +21,12 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@Api(tags = "测试场景")
@RestController @RestController
@RequestMapping("/system/scenario") @RequestMapping("/system/scenario")
public class TestScenarioController extends BaseController { public class TestScenarioController extends BaseController {
@Autowired @Autowired
private ITestScenarioService testScenarioService; private ITestScenarioService testScenarioService;
...@@ -34,8 +37,8 @@ public class TestScenarioController extends BaseController { ...@@ -34,8 +37,8 @@ public class TestScenarioController extends BaseController {
@Trace @Trace
@Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")}) @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@RequestMapping(method = RequestMethod.POST, value = "/getList") @RequestMapping(method = RequestMethod.POST, value = "/getList")
public TableDataInfo list(@Validated @RequestBody TestScenarioRequest testScenarioRequest){ public TableDataInfo<TestScenario> list(@Validated TestScenarioRequest testScenarioRequest){
startPage(); startPage(testScenarioRequest);
List<TestScenario> list = testScenarioService.selectTestScenarioList(testScenarioRequest); List<TestScenario> list = testScenarioService.selectTestScenarioList(testScenarioRequest);
return getDataTable(list); return getDataTable(list);
} }
......
...@@ -34,8 +34,8 @@ public class TestTypeController extends BaseController { ...@@ -34,8 +34,8 @@ public class TestTypeController extends BaseController {
@Trace @Trace
@Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")}) @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@RequestMapping(method = RequestMethod.POST, value = "/getList") @RequestMapping(method = RequestMethod.POST, value = "/getList")
public TableDataInfo list(@Validated @RequestBody TestTypeRequest testTypeRequest){ public TableDataInfo<TestType> list(@Validated TestTypeRequest testTypeRequest){
startPage(); startPage(testTypeRequest);
List<TestType> list = testTypeService.selectTestTypeList(testTypeRequest); List<TestType> list = testTypeService.selectTestTypeList(testTypeRequest);
return getDataTable(list); return getDataTable(list);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment