From 299e15ecf360734f77072d9df64afcd764154501 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 16:42:31 +0800
Subject: [PATCH] 常规检查 放弃功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 6d32f25..757f2d8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -120,6 +120,20 @@
}
}
+
+ @PostMapping("/routine-check-cancel")
+ @Operation(summary = "鍙栨秷甯歌妫�鏌�")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+ try {
+ return devRentService.cancelRoutineOperation(cancelReqVO);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("routineCheckCancel: " + err);
+ return CommonResult.error(ROUTINE_CANCEL_EXCEPTION);
+ }
+ }
+
@PostMapping("/dev-ready-cancel")
@Operation(summary = "鍙栨秷棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
@@ -128,8 +142,8 @@
return devRentService.cancelReadyOperation(cancelReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
- log.error("devCancel: " + err);
- return CommonResult.error(DEV_CANCEL_EXCEPTION);
+ log.error("devReadyCancel: " + err);
+ return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION);
}
}
@@ -141,8 +155,8 @@
return devRentService.cancelInstallOperation(cancelReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
- log.error("devCancel: " + err);
- return CommonResult.error(DEV_CANCEL_EXCEPTION);
+ log.error("devInstallCancel: " + err);
+ return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
}
}
--
Gitblit v1.9.3