update

eight

2024-09-27 08af453efa7f15ac5c3cc4eea5fb9e789a009979

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java

@@ -55,6 +55,7 @@
    }

    @Override
    @Transactional
    public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -62,7 +63,7 @@
        // 标注设备 已领取
        Integer ret = markDevRecieved(createReqVO.getDevId());
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_EXISTS);
            return CommonResult.error(DEVICE_NOT_FREE);
        }

        Long rent_id = createReqVO.getId();
@@ -122,7 +123,7 @@
        // 设置设备 使用中
        Integer ret = markDevInUse(createReqVO.getDevId());
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_EXISTS);
            return CommonResult.error(DEVICE_NOT_RECEIVED);
        }

        Long rent_id = createReqVO.getId();
@@ -213,6 +214,7 @@
    }

    @Override
    @Transactional
    public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
        updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
        updateDevRent( updateReqVO );
@@ -229,7 +231,7 @@
            jobRecordSaveReqVO.setDocName( userNickname );
            jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
            jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
            jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordSaveReqVO.setJobTime( updateReqVO.getEntryTime() );
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
            jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
            jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -237,11 +239,10 @@
            jobRecordMapper.insert(jobRecord);
        } else {
            jobRecordDO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
            jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordDO.setJobTime( updateReqVO.getEntryTime() );
            jobRecordDO.setRemark( updateReqVO.getRemark() );
            jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
            jobRecordDO.setUpdater( String.valueOf(userId) );
            jobRecordDO.setUpdateTime( LocalDateTime.now() );
            jobRecordMapper.updateById(jobRecordDO);
        }
        return updateReqVO.getId();
@@ -418,7 +419,7 @@
    private Integer markDevRecieved(String devId) {
        // 设备标注 已领取
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO) {
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
            deviveDO.setState( DevStateEnum.RECEIVED.getState() );
            return deviceMapper.updateById(deviveDO);
        }
@@ -429,7 +430,7 @@
    private Integer markDevInUse(String devId) {
        // 设备标注 在使用
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO) {
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
            deviveDO.setState( DevStateEnum.INUSE.getState() );
            return deviceMapper.updateById(deviveDO);
        }