Commit b2aa9c20 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 9d1d2c16
...@@ -37,7 +37,7 @@ public class ProjectController { ...@@ -37,7 +37,7 @@ public class ProjectController {
public ResponseEntity<List<ProjectEntity>> getProjectList(@RequestParam(name = "page", defaultValue = "1") Integer page, public ResponseEntity<List<ProjectEntity>> getProjectList(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "projectName", defaultValue = "") String projectName, @RequestParam(name = "projectName", defaultValue = "") String projectName,
@RequestParam(name = "userId", defaultValue = "") int userId) { @RequestParam(name = "userId", defaultValue = "") String userId) {
ProjectQueryRequestEntity data = new ProjectQueryRequestEntity(); ProjectQueryRequestEntity data = new ProjectQueryRequestEntity();
data.setProjectName(projectName); data.setProjectName(projectName);
data.setPageSize(pageSize); data.setPageSize(pageSize);
...@@ -54,8 +54,8 @@ public class ProjectController { ...@@ -54,8 +54,8 @@ public class ProjectController {
* @return 项目详情 * @return 项目详情
*/ */
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<ProjectEntity> getProjectById(@PathVariable Integer id) { public ResponseEntity<ProjectEntity> getProjectById(@PathVariable String id) {
ProjectEntity project = projectService.getProjectById(id); ProjectEntity project = projectService.getProjectById(Integer.valueOf(id));
return ResponseEntity.ok(project); return ResponseEntity.ok(project);
} }
......
...@@ -12,5 +12,5 @@ public class ProjectQueryRequestEntity { ...@@ -12,5 +12,5 @@ public class ProjectQueryRequestEntity {
private String projectName; private String projectName;
private int page; private int page;
private int pageSize; private int pageSize;
private int userId; private String userId;
} }
\ No newline at end of file
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