diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 1dcc0faf..6c20512a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -81,8 +81,8 @@ public class TbsCostApplyController { * @return */ @DeleteMapping("/removeCostById/{id}") - public R removeCostById(@PathVariable("id") String id){ - + public R removeCostById(@PathVariable("id") Long id){ + tbsCostApplyService.removeCostById(id); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java index 0575564d..4f58d712 100644 --- a/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java +++ b/src/main/java/com/qs/serve/modules/vtb/common/VtbVerificationState.java @@ -11,11 +11,12 @@ import lombok.Getter; @AllArgsConstructor public enum VtbVerificationState { - //状态:0=审批中;1=完成;2-中止;3-回滚 + //状态:0=审批中;1=完成;2-中止;3-回滚;4-作废 Commiting(0), Finished(1), Stop(2), - Rollback(3); + Rollback(3), + Cancel(4); private Integer code; diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 2308b765..c439b769 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -73,6 +73,17 @@ public class VtbVerificationController { private VtbVerificationYardItemService vtbVerificationYardItemService; private VtbVerificationOperationServiceImpl vtbVerificationOperationService; + /** + * 作废核销 + * @param id + * @return + */ + @DeleteMapping("/removeCheckById/{id}") + public R removeVtbById(@PathVariable("id") Long id){ + + return R.ok(); + } + /** * 管理员 * @param param diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 1e542484..21171eb7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -16,6 +16,11 @@ import javax.validation.Valid; */ public interface VtbVerificationService extends IService { + /** + * 作废核销 + * @param id + */ + void removeCheck(Long id); /** * 释放活动费用 diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index d5dcf79f..05355686 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.vtb.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.framework.manager.AsyncFactory; @@ -43,6 +44,8 @@ import com.qs.serve.modules.vtb.entity.bo.VtbVerificationChannelPointBo; import com.qs.serve.modules.vtb.entity.bo.VtbVerificationSubjectBo; import com.qs.serve.modules.seeyon.entity.XltApticlaim; import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; +import com.qs.serve.modules.vtb.mapper.VtbVerificationYardItemMapper; +import com.qs.serve.modules.vtb.mapper.VtbVerificationYardMapper; import com.qs.serve.modules.vtb.service.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -89,6 +92,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl