设备保养内容字段增加

云

2 天以前 e772b3d8cf395e9d441419373d883601350fbf0b

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

@@ -45,6 +45,11 @@
    private final FileUtil fileUtil;
    private final ISysNoticeService sysNoticeService;

    private static final int STATUS_PENDING_MAINTENANCE = 0;
    private static final int STATUS_COMPLETED = 1;
    private static final int STATUS_FAILED = 2;
    private static final int STATUS_PENDING_ACCEPTANCE = 3;

    @Override
    public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {

@@ -81,6 +86,12 @@
            deviceMaintenance.setDeviceName(byId.getDeviceName());
            deviceMaintenance.setDeviceModel(byId.getDeviceModel());
            deviceMaintenance.setAreaId(byId.getAreaId());
        }
        if (deviceMaintenance.getStatus() != null
                && deviceMaintenance.getStatus() == STATUS_COMPLETED
                && (oldDeviceMaintenance.getStatus() == null
                || oldDeviceMaintenance.getStatus() != STATUS_COMPLETED)) {
            return AjaxResult.error("请先提交验收审批，验收通过后才可完结");
        }
        // 处理备件使用情况
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
@@ -156,4 +167,56 @@
        vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_MAINTENANCE, id));
        return vo;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult confirmMaintenance(DeviceMaintenanceDto deviceMaintenanceDto) {
        DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenanceDto.getId());
        if (oldDeviceMaintenance == null) {
            return AjaxResult.error("保养记录不存在");
        }
        if (oldDeviceMaintenance.getStatus() != null && oldDeviceMaintenance.getStatus() == STATUS_COMPLETED) {
            return AjaxResult.error("该保养已完结，不能重复确认保养");
        }
        if (oldDeviceMaintenance.getStatus() != null && oldDeviceMaintenance.getStatus() == STATUS_PENDING_ACCEPTANCE) {
            return AjaxResult.error("该保养已提交验收审批");
        }
        deviceMaintenanceDto.setStatus(STATUS_PENDING_ACCEPTANCE);
        return updateDeviceDeviceMaintenance(deviceMaintenanceDto);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult approveMaintenanceAcceptance(DeviceMaintenanceDto deviceMaintenanceDto) {
        if (deviceMaintenanceDto.getId() == null) {
            return AjaxResult.error("保养记录id不能为空");
        }
        DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenanceDto.getId());
        if (oldDeviceMaintenance == null) {
            return AjaxResult.error("保养记录不存在");
        }
        if (oldDeviceMaintenance.getStatus() == null || oldDeviceMaintenance.getStatus() != STATUS_PENDING_ACCEPTANCE) {
            return AjaxResult.error("该保养未进入待验收状态，不能审批");
        }
        if (StringUtils.isBlank(deviceMaintenanceDto.getAcceptanceName())) {
            return AjaxResult.error("验收人不能为空");
        }
        if (deviceMaintenanceDto.getAcceptanceTime() == null) {
            return AjaxResult.error("验收时间不能为空");
        }
        if (StringUtils.isBlank(deviceMaintenanceDto.getAcceptanceRemark())) {
            return AjaxResult.error("验收备注不能为空");
        }

        DeviceMaintenance update = new DeviceMaintenance();
        update.setId(deviceMaintenanceDto.getId());
        update.setAcceptanceName(deviceMaintenanceDto.getAcceptanceName());
        update.setAcceptanceTime(deviceMaintenanceDto.getAcceptanceTime());
        update.setAcceptanceRemark(deviceMaintenanceDto.getAcceptanceRemark());
        update.setStatus(STATUS_COMPLETED);
        if (this.updateById(update)) {
            return AjaxResult.success();
        }
        return AjaxResult.error("验收审批失败");
    }
}