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 d1ed0932..1f34445b 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,6 +3,7 @@ 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; @@ -140,4 +141,11 @@ public interface ChangeRecordApi { @PostMapping("/api/visa/change/execute") ApiResult executeChangeRecord(@Validated @RequestBody ChangeRecordButtonOperationReq req); + /** + * 变洽签,“删除”按钮 + * + * @return void + */ + @PostMapping("/api/visa/change/delete") + ApiResult delete(@Validated @RequestBody ChangeRecordDeleteReq 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 new file mode 100644 index 00000000..edeae4e4 --- /dev/null +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/ChangeRecordDeleteReq.java @@ -0,0 +1,32 @@ +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-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java index bbed8c2d..f650d6f1 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaDetailByIdResponse.java @@ -191,6 +191,11 @@ public class VisaDetailByIdResponse { */ private VisaStatusEnum status; + /** + * 群组ID + */ + private Long imGroupId; + /** * 最终审批ID */ 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 25517b1a..4b23f8f2 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,6 +6,7 @@ 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; @@ -126,4 +127,10 @@ public class ChangeRecordController implements ChangeRecordApi { changeRecordService.doExecute(req); return ApiResult.ok(); } + + @Override + public ApiResult delete(ChangeRecordDeleteReq 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 122994b3..54a070b4 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,6 +3,7 @@ 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; @@ -118,4 +119,7 @@ public interface ChangeRecordService extends IService { void reDecision(ChangeRecordButtonOperationReq req); void doExecute(ChangeRecordButtonOperationReq req); + + void delete(ChangeRecordDeleteReq 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 bc81456f..ed5ca1e4 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,6 +35,7 @@ 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; @@ -388,6 +389,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl