1.优化正式库 2.yml设置

liding

16 小时以前 c8fbeff3b07f96ffb4624dd64344ac00ec0c8ef8

 main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java

@@ -20,6 +20,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,7 +67,7 @@
        if (!userIds.isEmpty()) {
            List<SysUser> sysUsers = sysUserMapper.selectList(userIds);
            userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity()));
        }else {
        } else {
            userMap = new HashMap<>();
        }
        //匹配数据
@@ -92,6 +93,12 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addOrEditUsageRecord(EquipmentUsageRecordDto equipmentUsageRecordDto) {
        // 参数校验
        if (equipmentUsageRecordDto == null) {
            throw new IllegalArgumentException("设备使用记录参数不能为空");
        }

        // 复制属性到实体对象
        EquipmentUsageRecord equipmentUsageRecord = new EquipmentUsageRecord();
        BeanUtils.copyProperties(equipmentUsageRecordDto, equipmentUsageRecord);

@@ -99,12 +106,13 @@
        Long equipmentId = equipmentUsageRecordDto.getEquipmentId();
        Integer newUsageQuantity = equipmentUsageRecordDto.getUsageQuantity();

        // 查询设备信息（带乐观锁版本号）
        // 查询设备信息
        EquipmentManagement equipment = equipmentManagementMapper.selectById(equipmentId);
        if (equipment == null) {
            throw new RuntimeException("设备不存在");
        }

        // 新增记录逻辑
        if (Objects.isNull(equipmentUsageRecordDto.getId())) {
            // 检查库存是否充足
            if (equipment.getQuantity() < newUsageQuantity) {
@@ -115,9 +123,18 @@
            equipment.setQuantity(equipment.getQuantity() - newUsageQuantity);
            equipmentManagementMapper.updateById(equipment);

            // 创建领用记录
            // 设置使用开始时间为当前时间
            equipmentUsageRecord.setUsageStartTime(LocalDate.now());

            // 如果状态为1(已归还)，则设置结束时间
            if ("1".equals(equipmentUsageRecordDto.getEquipmentStatus())) {
                equipmentUsageRecord.setUsageEndTime(LocalDate.now());
            }

            return equipmentUsageRecordMapper.insert(equipmentUsageRecord);
        } else {
        }
        // 更新记录逻辑
        else {
            // 1. 查询原领用记录
            EquipmentUsageRecord originalRecord = equipmentUsageRecordMapper.selectById(equipmentUsageRecordDto.getId());
            if (originalRecord == null) {
@@ -128,7 +145,7 @@
            int quantityDelta = newUsageQuantity - originalRecord.getUsageQuantity();

            if (quantityDelta != 0) {
                // 3. 检查调整后库存是否充足（考虑增加和减少两种情况）
                // 3. 检查调整后库存是否充足
                int newInventory = equipment.getQuantity() - quantityDelta;
                if (newInventory < 0) {
                    throw new RuntimeException("库存不足，调整后库存将为：" + newInventory);
@@ -141,7 +158,13 @@
                }
            }

            // 5. 更新领用记录
            // 5. 如果状态变为1(已归还)，则设置结束时间为当前时间
            if ("1".equals(equipmentUsageRecordDto.getEquipmentStatus()) &&
                    (originalRecord.getEquipmentStatus() == null || !"1".equals(originalRecord.getEquipmentStatus()))) {
                equipmentUsageRecord.setUsageEndTime(LocalDate.now());
            }

            // 6. 更新领用记录
            return equipmentUsageRecordMapper.updateById(equipmentUsageRecord);
        }
    }