Merge remote-tracking branch 'origin/master'
commit
c160793d93
|
@ -117,9 +117,6 @@ public class TaskController {
|
||||||
@RequestHeader(TokenUtils.HEADER_TOKEN) String token,
|
@RequestHeader(TokenUtils.HEADER_TOKEN) String token,
|
||||||
@PathVariable Integer projectId
|
@PathVariable Integer projectId
|
||||||
) {
|
) {
|
||||||
if (!projectService.checkOpenStatus(projectId)) {
|
|
||||||
throw new BadRequestException(IProjectService.PROJECT_UNOPENED);
|
|
||||||
}
|
|
||||||
return ResponseMap.ofSuccess("查询成功", taskService.getProjectProcessOfEveryone(token, projectId));
|
return ResponseMap.ofSuccess("查询成功", taskService.getProjectProcessOfEveryone(token, projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,9 +127,6 @@ public class TaskController {
|
||||||
@PathVariable Integer projectId,
|
@PathVariable Integer projectId,
|
||||||
@PathVariable(required = false) Integer staffId
|
@PathVariable(required = false) Integer staffId
|
||||||
) {
|
) {
|
||||||
if (!projectService.checkOpenStatus(projectId)) {
|
|
||||||
throw new BadRequestException(IProjectService.PROJECT_UNOPENED);
|
|
||||||
}
|
|
||||||
return ResponseList.ofSuccess("查询成功", taskService.getProjectStatistics(token, projectId, staffId));
|
return ResponseList.ofSuccess("查询成功", taskService.getProjectStatistics(token, projectId, staffId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue