feat(config): 添加新环境配置并扩展设备台账功能

云

3 天以前 4f55d3cb4bc644e4534106336f2047af1a4db5df

 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java

@@ -67,6 +67,7 @@
        DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
        deviceRepairDto.setDeviceName(byId.getDeviceName());
        deviceRepairDto.setDeviceModel(byId.getDeviceModel());
        deviceRepairDto.setAreaId(byId.getAreaId());
        if (deviceRepairDto.getStatus() == null) {
            deviceRepairDto.setStatus(STATUS_PENDING_REPAIR);
        }
@@ -86,6 +87,15 @@
        if (oldDeviceRepair == null) {
            return AjaxResult.error("报修记录不存在");
        }
        Long effectiveDeviceLedgerId = deviceRepairDto.getDeviceLedgerId() != null
                ? deviceRepairDto.getDeviceLedgerId()
                : oldDeviceRepair.getDeviceLedgerId();
        DeviceLedger byId = deviceLedgerService.getById(effectiveDeviceLedgerId);
        if (byId != null) {
            deviceRepairDto.setDeviceName(byId.getDeviceName());
            deviceRepairDto.setDeviceModel(byId.getDeviceModel());
            deviceRepairDto.setAreaId(byId.getAreaId());
        }
        if (deviceRepairDto.getStatus() != null
                && deviceRepairDto.getStatus() == STATUS_COMPLETED
                && (oldDeviceRepair.getStatus() == null