update

eight

2024-09-26 137e9fb1f28d213d2608c12e17ece1dd57cec452

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java

@@ -2,7 +2,6 @@

import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -143,7 +142,16 @@
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
        DevRentDO devRent = devRentService.getDevRent(id);
        return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
        if (null != deviceDO) {
            devRentRespVO.setCategory(deviceDO.getCategory());
            devRentRespVO.setBrand(deviceDO.getBrand());
            devRentRespVO.setModel(deviceDO.getModel());
        }
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/page")
@@ -167,13 +175,33 @@
                        BeanUtils.toBean(list, DevRentRespVO.class));
    }

    @GetMapping("/get-dismantle-rent")
    @GetMapping("/get-ready-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
    public CommonResult<DevRentRespVO> getReadyRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        searchReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
        DevRentDO devRent = devRentService.getDismantleRent( searchReqVO );
        DevRentDO devRent = devRentService.getReadyOrCancelledRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
        if (null != deviceDO) {
            devRentRespVO.setCategory(deviceDO.getCategory());
            devRentRespVO.setBrand(deviceDO.getBrand());
            devRentRespVO.setModel(deviceDO.getModel());
        }
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/get-installed-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }