diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java index f973f32..2649ca2 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java @@ -28,7 +28,7 @@ public class EvalInternalReviewController { @ApiOperation("按项目查询") @GetMapping("/get") - public SingleResponse get(@ApiParam("项目ID") @RequestParam String projectId) { + public SingleResponse get(@ApiParam("项目ID") @RequestParam Long projectId) { return evalInternalReviewApi.getByProject(projectId); } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java index 7c94aae..e371ecf 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java @@ -7,8 +7,8 @@ import org.qinan.safetyeval.client.api.institution.EvalInternalReviewApi; import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd; -import org.qinan.safetyeval.domain.entity.EvalProjectEntity; import org.qinan.safetyeval.domain.entity.EvalInternalReviewEntity; +import org.qinan.safetyeval.domain.entity.EvalProjectEntity; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.EvalInternalReviewGateway; @@ -47,11 +47,10 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { } @Override - public SingleResponse getByProject(String projectId) { - Long pid = Long.parseLong(projectId); - evalProjectNodeSupport.assertRead(pid); - EvalProjectEntity project = evalProjectNodeSupport.requireProject(pid); - EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(pid, project.getOrgId()); + public SingleResponse getByProject(Long projectId) { + evalProjectNodeSupport.assertRead(projectId); + EvalProjectEntity project = evalProjectNodeSupport.requireProject(projectId); + EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(projectId, project.getOrgId()); if (entity == null) { throw new BizException(ErrorCode.EVAL_INTERNAL_REVIEW_NOT_FOUND); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java index 0f39147..65c93bd 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java @@ -6,5 +6,5 @@ import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd; public interface EvalInternalReviewApi { SingleResponse getOrSave(EvalInternalReviewSaveCmd cmd); - SingleResponse getByProject(String projectId); + SingleResponse getByProject(Long projectId); }