序号表操作

eight

2024-11-07 e36c1e2363e36a69a3cc8ccbc00d28b16f926abd

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

@@ -196,6 +196,12 @@
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rent_id = createReqVO.getId();

        // 对于已有领用，但是装机时使用的不是已领用设备，需释放 源领用 设备
        DevRentDO devRentDO = getDevRent(rent_id);
        if ( null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId()) ) {
            markDevFree( devRentDO.getDevId(), rent_id);
        }

        // 设置设备 使用中
        Integer ret = markDevInUse(createReqVO.getDevId(), rent_id);
        if (null == ret || 0 == ret) {
@@ -515,23 +521,29 @@
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
        DevStateEnum devStateEnum = null;
        if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState())
        DevRentStateEnum devRentStateEnum = null;
        if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
            devStateEnum = DevStateEnum.DAMAGED;
        else if (updateReqVO.getState() == DevStateEnum.LOST.getState())
            devRentStateEnum = DevRentStateEnum.DAMAGED;
        }
        else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
            devStateEnum = DevStateEnum.LOST;
            devRentStateEnum = DevRentStateEnum.LOST;
        }
        else
            throw exception(DEV_DISMANTLE_EXCEPTION);

        // 设备遗失时, 标注遗失
        markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );

        updateReqVO.setState( DevRentStateEnum.LOST.getState() );
        updateReqVO.setState( devRentStateEnum.getState() );
        updateDevRent( updateReqVO );

        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.DAMAGED.getState());
        jobTypeList.add( DevRentStateEnum.LOST.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
        if (null == jobRecordDO) {
@@ -543,13 +555,13 @@
            jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
            jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
            jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.LOST.getState() );
            jobRecordSaveReqVO.setJobType( devRentStateEnum.getState() );
            jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
            jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
            jobRecordDO.setJobType( DevRentStateEnum.LOST.getState() );
            jobRecordDO.setJobType( devRentStateEnum.getState() );
            jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordDO.setRemark( updateReqVO.getRemark() );
            jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -640,12 +652,12 @@
    // 标记 设备已被领取
    private Integer markDevRecieved(String devId, Long rentId) {
        // 设备标注 已领取
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
            deviveDO.setState( DevStateEnum.RECEIVED.getState() );
            deviveDO.setRentId( rentId );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviceDO && DevStateEnum.FREE.isEqual(deviceDO.getState())) {
            deviceDO.setState( DevStateEnum.RECEIVED.getState() );
            deviceDO.setRentId( rentId );
            deviceDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
@@ -653,21 +665,21 @@

    // 标记 设备已被使用
    private Integer markDevInUse(String devId, Long rentId) {
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null == deviveDO)
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null == deviceDO)
            return 0;

        if (deviveDO.getState() == DevStateEnum.RECEIVED.getState() && deviveDO.getRentId() == rentId) {
            deviveDO.setState( DevStateEnum.INUSE.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
        if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( DevStateEnum.INUSE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviceDO);
        }

        if (deviveDO.getState() == DevStateEnum.FREE.getState()) {
            deviveDO.setState( DevStateEnum.INUSE.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            deviveDO.setRentId( rentId );
            return deviceMapper.updateById(deviveDO);
        if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
            deviceDO.setState( DevStateEnum.INUSE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            deviceDO.setRentId( rentId );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
@@ -675,11 +687,11 @@

    private Integer markDevDismantleException(String devId, Long rentId, LocalDate localDate, DevStateEnum devStateEnum) {
        // 设备标注遗失
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.INUSE.getState() && deviveDO.getRentId() == rentId) {
            deviveDO.setState( devStateEnum.getState() );
            deviveDO.setStateDate( localDate );
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviceDO && DevStateEnum.INUSE.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( devStateEnum.getState() );
            deviceDO.setStateDate( localDate );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
@@ -687,12 +699,12 @@

    private Integer markDevFree(String devId, Long rentId) {
        // 设备标注遗失 恢复为空闲
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
        if (null != deviveDO && deviveDO.getRentId() == rentId) {
            deviveDO.setState( DevStateEnum.FREE.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            deviveDO.setRentId(null);
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId( devId );
        if (null != deviceDO && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( DevStateEnum.FREE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            deviceDO.setRentId(null);
            return deviceMapper.updateById(deviceDO);
        }
        
        return 0;