From 01a81beea99c0298a3b6178c7796f4c27b30c6c7 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 15 四月 2025 14:27:50 +0800 Subject: [PATCH] pat detail. 新增 appontment_id --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 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 b26af12..e34d230 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,6 +23,14 @@ CommonResult<Long> registerOperation(@Valid DevRentSaveReqVO createReqVO); /** + * 甯歌妫�鏌� 瀹屾垚 + * + * @param createReqVO 鍒涘缓淇℃伅 + * @return 缂栧彿 + */ + CommonResult<Long> routineFinishOperation(@Valid RoutineFinishReqVO createReqVO); + + /** * 璁惧鍑嗗 * * @param createReqVO 鍒涘缓淇℃伅 @@ -54,13 +62,30 @@ */ Long dataEntryOperation(@Valid DevRentSaveReqVO createReqVO); + /** - * 瑁呮満 + * 甯歌妫�鏌� 鍙栨秷 * * @param cancelReqVO 鍒涘缓淇℃伅 * @return 缂栧彿 */ - CommonResult<Long> cancelOperation(@Valid DevCancelReqVO cancelReqVO); + CommonResult<Long> cancelRoutineOperation(@Valid DevCancelReqVO cancelReqVO); + + /** + * 鍙栨秷棰嗙敤 + * + * @param cancelReqVO 鍒涘缓淇℃伅 + * @return 缂栧彿 + */ + CommonResult<Long> cancelReadyOperation(@Valid DevCancelReqVO cancelReqVO); + + /** + * 鍙栨秷瑁呮満 + * + * @param cancelReqVO 鍒涘缓淇℃伅 + * @return 缂栧彿 + */ + CommonResult<Long> cancelInstallOperation(@Valid DevCancelReqVO cancelReqVO); /** * 閬楀け @@ -68,7 +93,7 @@ * @param createReqVO 鍒涘缓淇℃伅 * @return 缂栧彿 */ - CommonResult<Long> loseOperation(@Valid DevRentSaveReqVO createReqVO); + CommonResult<Long> dismantleExceptionOperation(@Valid DevRentSaveReqVO createReqVO); /** * 鍒涘缓瑁呮満鎷嗘満 @@ -108,7 +133,10 @@ */ PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO); - DevRentDO getInstalledOrCancelledRent(DevRentSearchReqVO searchReqVO); + DevRentDO getExistingRent(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