From 8a696df0dc708989e9f46a59056b206684a5e622 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 10 四月 2025 10:53:28 +0800
Subject: [PATCH] 已领用的  也支持拆机

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java |   66 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 7 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 7de494e..20ee98f 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
@@ -1,6 +1,6 @@
 package cn.lihu.jh.module.ecg.controller.admin.devrent;
 
-import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
 import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
 import cn.lihu.jh.module.ecg.enums.DevStateEnum;
 import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
@@ -25,7 +25,6 @@
 
 import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
-import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
 
 import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
 import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -53,18 +52,38 @@
 
     // 甯歌妫�鏌� 瀹屾垚
     @PostMapping("/routine-finish")
-    @Operation(summary = "")
+    @Operation(summary = "甯歌妫�鏌ュ畬鎴�")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
         CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+
+        try {
+            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+            Long rentId = routineFinishReqVO.getId();
+            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        } catch (Exception e) {
+            log.error("甯歌妫�鏌ュ畬鎴�, 鑷姩纭垂澶辫触", e);
+        }
+
         return result;
     }
 
     @PostMapping("/dev-ready")
-    @Operation(summary = "璁惧棰嗙敤")
+    @Operation(summary = "璁惧棰嗙敤瀹屾垚")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
         CommonResult<Long> result = devRentService.readyOperation(createReqVO);
+
+        try {
+            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+            Long rentId = createReqVO.getId();
+            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+        } catch (Exception e) {
+            log.error("璁惧棰嗙敤瀹屾垚, 鑷姩纭垂澶辫触", e);
+        }
+
         return result;
     }
 
@@ -226,12 +245,12 @@
         return CommonResult.success(devRentRespVO);
     }
 
-    @GetMapping("/get-installed-rent")
-    @Operation(summary = "鑾峰彇宸插畨瑁呯璧佹儏鍐�")
+    @GetMapping("/get-existing-rent")
+    @Operation(summary = "鑾峰彇宸插畨瑁呫�佸凡棰嗙敤鐨勭璧佹儏鍐�")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
     {
-        DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
+        DevRentDO devRent = devRentService.getExistingRent( searchReqVO );
         if (null == devRent) {
             return CommonResult.success(null);
         }
@@ -242,6 +261,7 @@
         devRentRespVO.setCategory( deviceDO.getCategory() );
         devRentRespVO.setBrand( deviceDO.getBrand() );
         devRentRespVO.setModel( deviceDO.getModel() );
+        devRentRespVO.setDevState( devRent.getState() );
         return CommonResult.success(devRentRespVO);
     }
 
@@ -263,4 +283,36 @@
         devRentRespVO.setModel( deviceDO.getModel() );
         return CommonResult.success(devRentRespVO);
     }
+
+    // 纭垂
+    @GetMapping("/fee-confirm")
+    @Operation(summary = "纭垂")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+    public CommonResult<Integer> feeConfirm(@Valid Long rentId) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+        Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, true);
+        if (1 == result)
+            return CommonResult.error(result, "纭垂澶辫触");
+
+        return CommonResult.success(result);
+    }
+
+    // 鍙栨秷纭垂
+    @GetMapping("/fee-cancel")
+    @Operation(summary = "鍙栨秷纭垂")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+    public CommonResult<Integer> feeCancel(@Valid Long rentId) {
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+        Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, false);
+        if (1 == result)
+            return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
+
+        return CommonResult.success(result);
+    }
 }

--
Gitblit v1.9.3