refactor(approve): 优化审批流程ID生成逻辑

云

2 天以前 c477506a6d672f71c6353608f3cf3424d8026790

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

@@ -20,7 +20,6 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +33,6 @@
import java.util.List;

@Service
@AllArgsConstructor
@Slf4j
public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, DeviceRepair> implements IDeviceRepairService {

@@ -51,43 +49,37 @@

    @Override
    public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {

        return deviceRepairMapper.queryPage(page, deviceRepairDto);
    }

    @Override
    public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        deviceRepair.setDeviceName(byId.getDeviceName());
        deviceRepair.setDeviceModel(byId.getDeviceModel());
        boolean save = this.save(deviceRepair);
        if (save){
            return AjaxResult.success();
        List<DeviceRepair> records = buildRepairRecords(deviceRepair);
        if (records.isEmpty()) {
            return AjaxResult.error("请选择设备");
        }
        return AjaxResult.error();
        return this.saveBatch(records) ? AjaxResult.success() : AjaxResult.error();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
        DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
        // 处理备件使用情况
        if (oldDeviceRepair == null) {
            return AjaxResult.error("报修记录不存在");
        }
        if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
            List<Long> sparePartIds = new ArrayList<>();
            for (DeviceRepair.SparePartUse sparePartUse : deviceRepair.getSparePartsUseList()) {
                // 获取备件信息
                SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
                if (spareParts != null) {
                    // 检查数量是否足够
                    if (spareParts.getQuantity().compareTo(new BigDecimal(sparePartUse.getQuantity())) >= 0) {
                        // 更新数量
                        spareParts.setQuantity(spareParts.getQuantity().subtract(new BigDecimal(sparePartUse.getQuantity())));
                        sparePartsMapper.updateById(spareParts);
                        sparePartIds.add(sparePartUse.getId());

                        // 创建备件领用记录
                        SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
                        record.setSourceType(0); // 0 维修
                        record.setSourceType(0);
                        record.setSourceId(deviceRepair.getId());
                        record.setDeviceLedgerId(oldDeviceRepair.getDeviceLedgerId());
                        record.setSparePartsId(sparePartUse.getId());
@@ -98,7 +90,6 @@
                    }
                }
            }
            // 更新备件IDs字段
            if (!sparePartIds.isEmpty()) {
                deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
            }
@@ -106,12 +97,11 @@

        if (this.updateById(deviceRepair)) {
            Long id = deviceRepair.getId();
            //
            DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
            deviceDefectRecordDto.setDeviceLedgerId(id);
            deviceDefectRecordDto.setStatus("严重缺陷");
            List<DeviceDefectRecordDto> records = deviceDefectRecordService.listPage(new Page<>(1, -1), deviceDefectRecordDto).getRecords();
            if (!records.isEmpty()){
            if (!records.isEmpty()) {
                records.forEach(deviceDefectRecord -> {
                    deviceDefectRecord.setStatus("正常");
                    deviceDefectRecordService.updateByDDR(deviceDefectRecord);
@@ -124,42 +114,59 @@

    @Override
    public void export(HttpServletResponse response, Long[] ids) {
        List<DeviceRepair> supplierManageList;
        if (ids == null || ids.length == 0) {
            List<DeviceRepair> supplierManageList = this.list();
            ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
            supplierManageList.stream().forEach(deviceRepair -> {
                DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
                BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
                deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "待维修" : deviceRepair.getStatus() == 1 ? "完结" : "失败");

                deviceLedgerExeclDtos.add(deviceRepairExeclDto);
            });
            ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
            util.exportExcel(response, deviceLedgerExeclDtos, "设备报修导出");
        }else {
            ArrayList<Long> arrayList = new ArrayList<>();
            Arrays.stream(ids).map(id -> {
                return arrayList.add( id);
            });
            List<DeviceRepair> supplierManageList = deviceRepairMapper.selectBatchIds(arrayList);
            ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
            supplierManageList.stream().forEach(deviceRepair -> {
                DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
                BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
                deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "待维修" : deviceRepair.getStatus() == 1 ? "完结" : "失败");

                deviceLedgerExeclDtos.add(deviceRepairExeclDto);
            });
            ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
            util.exportExcel(response, deviceLedgerExeclDtos, "设备报修导出");
            supplierManageList = this.list();
        } else {
            supplierManageList = deviceRepairMapper.selectBatchIds(Arrays.asList(ids));
        }

        ArrayList<DeviceRepairExeclDto> result = new ArrayList<>();
        supplierManageList.forEach(deviceRepair -> {
            DeviceRepairExeclDto dto = new DeviceRepairExeclDto();
            BeanUtils.copyProperties(deviceRepair, dto);
            dto.setStatusStr(deviceRepair.getStatus() == 0 ? "待维修" : deviceRepair.getStatus() == 1 ? "完结" : "失败");
            result.add(dto);
        });
        ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<>(DeviceRepairExeclDto.class);
        util.exportExcel(response, result, "设备报修导出");
    }

    @Override
    public DeviceRepairDto detailById(Long id) {

        return deviceRepairMapper.detailById(id);
    }

    private List<DeviceRepair> buildRepairRecords(DeviceRepair source) {
        Long[] deviceIds = source.getDeviceLedgerIds();
        if (deviceIds == null || deviceIds.length == 0) {
            deviceIds = source.getDeviceLedgerId() == null ? new Long[0] : new Long[]{source.getDeviceLedgerId()};
        }
        List<DeviceRepair> records = new ArrayList<>();
        Arrays.stream(deviceIds).distinct().forEach(deviceId -> {
            DeviceLedger deviceLedger = deviceLedgerService.getById(deviceId);
            if (deviceLedger == null) {
                return;
            }
            int quantity = resolveQuantity(deviceLedger);
            for (int i = 0; i < quantity; i++) {
                DeviceRepair record = new DeviceRepair();
                BeanUtils.copyProperties(source, record);
                record.setId(null);
                record.setDeviceLedgerIds(null);
                record.setDeviceLedgerId(deviceLedger.getId());
                record.setAreaId(deviceLedger.getAreaId());
                record.setDeviceName(deviceLedger.getDeviceName());
                record.setDeviceModel(deviceLedger.getDeviceModel());
                records.add(record);
            }
        });
        return records;
    }

    private int resolveQuantity(DeviceLedger deviceLedger) {
        if (deviceLedger == null || deviceLedger.getNumber() == null || deviceLedger.getNumber().compareTo(BigDecimal.ONE) < 0) {
            return 1;
        }
        return Math.max(1, deviceLedger.getNumber().intValue());
    }
}