diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProcessControlController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProcessControlController.java index cb6d675..23a5246 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProcessControlController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProcessControlController.java @@ -53,10 +53,10 @@ public class EvalProcessControlController { return evalProcessControlApi.getDetailByProject(projectId); } - @ApiOperation("生成归档交接单") - @PostMapping("/generate-handover-form") - public SingleResponse generateHandoverForm(@Validated @RequestBody EvalProcessHandoverFormCmd cmd) { - return evalProcessControlApi.generateHandoverForm(cmd); + @ApiOperation("生成生成过程控制表") + @PostMapping("/generate-process-control-form") + public SingleResponse generateProcessControlForm(@Validated @RequestBody EvalgenerateProcessControlFormCmd cmd) { + return evalProcessControlApi.generateProcessControlForm(cmd); } @ApiOperation("归档项目并入库报告") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java index e6f5ee3..5412b63 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java @@ -290,7 +290,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi { } @Override - public SingleResponse generateHandoverForm(EvalProcessHandoverFormCmd cmd) { + public SingleResponse generateProcessControlForm(EvalgenerateProcessControlFormCmd cmd) { Long projectId = Long.parseLong(cmd.getProjectId()); EvalProjectEntity project = evalProjectNodeSupport.requireProject(projectId); // 校验前置节点是否全部完成(过程控制节点除外) diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProcessControlApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProcessControlApi.java index eb01585..2a9db55 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProcessControlApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalProcessControlApi.java @@ -8,7 +8,7 @@ import org.qinan.safetyeval.client.dto.institution.EvalProcessArchiveCmd; import org.qinan.safetyeval.client.dto.institution.EvalProcessControlAssignCmd; import org.qinan.safetyeval.client.dto.institution.EvalProcessControlConfirmCmd; import org.qinan.safetyeval.client.dto.institution.EvalProcessControlSaveCmd; -import org.qinan.safetyeval.client.dto.institution.EvalProcessHandoverFormCmd; +import org.qinan.safetyeval.client.dto.institution.EvalgenerateProcessControlFormCmd; import java.util.List; @@ -18,7 +18,7 @@ public interface EvalProcessControlApi { SingleResponse assign(EvalProcessControlAssignCmd cmd); SingleResponse getByProject(String projectId); SingleResponse getDetailByProject(Long projectId); - SingleResponse generateHandoverForm(EvalProcessHandoverFormCmd cmd); + SingleResponse generateProcessControlForm(EvalgenerateProcessControlFormCmd cmd); SingleResponse archive(EvalProcessArchiveCmd cmd); SingleResponse> listProjectFiles(Long projectId); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessHandoverFormCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalgenerateProcessControlFormCmd.java similarity index 78% rename from safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessHandoverFormCmd.java rename to safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalgenerateProcessControlFormCmd.java index 44a9e2b..6ef324e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessHandoverFormCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalgenerateProcessControlFormCmd.java @@ -5,7 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; @Data -public class EvalProcessHandoverFormCmd { +public class EvalgenerateProcessControlFormCmd { @NotBlank private String projectId;