From d66c56b36f20ff23a54cff30eb6a6a4ff9d87bf1 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 10 Feb 2025 17:15:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E5=88=A0=E9=99=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE-=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/changerecord/ChangeRecordApi.java | 3 +- .../api/request/ChangeRecordDeleteReq.java | 32 ------------------- .../controller/ChangeRecordController.java | 3 +- .../server/service/ChangeRecordService.java | 3 +- .../service/impl/ChangeRecordServiceImpl.java | 3 +- 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordDeleteReq.java diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java index 1f34445b..1ef9c73f 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java @@ -3,7 +3,6 @@ package cn.axzo.nanopart.visa.api.changerecord; import cn.axzo.framework.domain.web.result.ApiPageResult; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; -import cn.axzo.nanopart.visa.api.request.ChangeRecordDeleteReq; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; import cn.axzo.nanopart.visa.api.request.FetchVisaAllConfirmReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; @@ -147,5 +146,5 @@ public interface ChangeRecordApi { * @return void */ @PostMapping("/api/visa/change/delete") - ApiResult delete(@Validated @RequestBody ChangeRecordDeleteReq req); + ApiResult deleteChangeRecord(@Validated @RequestBody ChangeRecordButtonOperationReq req); } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordDeleteReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordDeleteReq.java deleted file mode 100644 index edeae4e4..00000000 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordDeleteReq.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.axzo.nanopart.visa.api.request; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; - -/** - * @author chenwenjian - * @version 1.0 - * @date 2025/2/10 16:21 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ChangeRecordDeleteReq { - - /** - * 变洽签证id - */ - @NotNull(message = "变洽签id 不能为空") - private Long visaId; - - /** - * 操作人 personId - */ - @NotNull(message = "操作人 personId 不能为空") - private Long operatorPersonId; -} diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java index 4b23f8f2..8594af72 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java @@ -6,7 +6,6 @@ import cn.axzo.framework.domain.web.result.PageData; import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordApi; import cn.axzo.nanopart.visa.api.enums.VisaButtonTypeEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; -import cn.axzo.nanopart.visa.api.request.ChangeRecordDeleteReq; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; import cn.axzo.nanopart.visa.api.request.FetchVisaAllConfirmReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; @@ -129,7 +128,7 @@ public class ChangeRecordController implements ChangeRecordApi { } @Override - public ApiResult delete(ChangeRecordDeleteReq req) { + public ApiResult deleteChangeRecord(ChangeRecordButtonOperationReq req) { changeRecordService.delete(req); return ApiResult.ok(); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java index 54a070b4..d85ab8d7 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java @@ -3,7 +3,6 @@ package cn.axzo.nanopart.visa.server.service; import cn.axzo.framework.domain.web.result.PageData; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; -import cn.axzo.nanopart.visa.api.request.ChangeRecordDeleteReq; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveOnlyReq; @@ -120,6 +119,6 @@ public interface ChangeRecordService extends IService { void doExecute(ChangeRecordButtonOperationReq req); - void delete(ChangeRecordDeleteReq req); + void delete(ChangeRecordButtonOperationReq req); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 30b57a15..cb8a125f 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -35,7 +35,6 @@ import cn.axzo.nanopart.visa.api.enums.VisaRelationVarTypeEnum; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordButtonOperationReq; -import cn.axzo.nanopart.visa.api.request.ChangeRecordDeleteReq; import cn.axzo.nanopart.visa.api.request.ChangeStatusRequest; import cn.axzo.nanopart.visa.api.request.ImGroupOperationClearReq; import cn.axzo.nanopart.visa.api.request.VisaChangeApproveCreateReq; @@ -1370,7 +1369,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl