From bbfe442096b9b4e5ea1335fa6b7bb7d8d6209a9b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 Jul 2022 16:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcServiceRecordV2Controller.java | 9 +++++++++ .../com/epmet/service/IcServiceRecordV2Service.java | 2 ++ .../service/impl/IcServiceRecordV2ServiceImpl.java | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index 538bee258d..92a3966962 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -63,6 +63,15 @@ public class IcServiceRecordV2Controller { return new Result(); } + @NoRepeatSubmit + @PostMapping("cancel") + public Result cancel(@RequestBody IcServiceRecordV2AddEditFormDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icServiceRecordV2Service.cancel(dto); + return new Result(); + } + @PostMapping("delete") public Result delete(@RequestBody String[] ids){ //效验数据 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java index a88b4f1a13..6d7860ea1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java @@ -85,4 +85,6 @@ public interface IcServiceRecordV2Service extends BaseService%s", formDTO.getServiceRecordId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "取消服务记录失败,未查询到服务记录"); + } + entity.setServiceStatus("cancel"); + baseDao.updateById(entity); + } + @Override @Transactional(rollbackFor = Exception.class) public void delete(String[] ids) {