From fdc1034997607adbe8da9939c45bd48c3cb03b98 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 08 四月 2025 23:09:13 +0800 Subject: [PATCH] refactor - rename --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java index b2c49b7..58beb4d 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java @@ -23,12 +23,12 @@ CommonResult<Long> registerOperation(@Valid DevRentSaveReqVO createReqVO); /** - * 璁惧鍑嗗 + * 甯歌妫�鏌� 瀹屾垚 * * @param createReqVO 鍒涘缓淇℃伅 * @return 缂栧彿 */ - CommonResult<Long> routineFinishOperation(@Valid DevRentSaveReqVO createReqVO); + CommonResult<Long> routineFinishOperation(@Valid RoutineFinishReqVO createReqVO); /** * 璁惧鍑嗗 @@ -62,6 +62,15 @@ */ Long dataEntryOperation(@Valid DevRentSaveReqVO createReqVO); + + /** + * 甯歌妫�鏌� 鍙栨秷 + * + * @param cancelReqVO 鍒涘缓淇℃伅 + * @return 缂栧彿 + */ + CommonResult<Long> cancelRoutineOperation(@Valid DevCancelReqVO cancelReqVO); + /** * 鍙栨秷棰嗙敤 * @@ -84,7 +93,7 @@ * @param createReqVO 鍒涘缓淇℃伅 * @return 缂栧彿 */ - CommonResult<Long> loseOperation(@Valid DevRentSaveReqVO createReqVO); + CommonResult<Long> dismantleExceptionOperation(@Valid DevRentSaveReqVO createReqVO); /** * 鍒涘缓瑁呮満鎷嗘満 @@ -125,6 +134,9 @@ PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO); DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO); + DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO); DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO); DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO); + + Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel); } \ No newline at end of file -- Gitblit v1.9.3