chenhj
2026-04-24 ffe4413db421aabb7446007ff76d4e9943c6fc84
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationServiceImpl.java
@@ -1,16 +1,16 @@
package com.ruoyi.technology.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationParamSyncDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationParamService;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -26,27 +26,22 @@
    private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
    private final TechnologyRoutingMapper technologyRoutingMapper;
    private final TechnologyRoutingOperationParamService technologyRoutingOperationParamService;
    @Override
    public IPage<TechnologyRoutingOperationVo> pageTechnologyRoutingOperation(Page<TechnologyRoutingOperationDto> page,
                                                                              TechnologyRoutingOperationDto technologyRoutingOperationDto) {
        Page<TechnologyRoutingOperation> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
        return this.page(entityPage, buildQueryWrapper(technologyRoutingOperationDto))
                .convert(item -> BeanUtil.copyProperties(item, TechnologyRoutingOperationVo.class));
        return technologyRoutingOperationMapper.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto);
    }
    @Override
    public List<TechnologyRoutingOperationVo> listTechnologyRoutingOperation(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
        return BeanUtil.copyToList(this.list(buildQueryWrapper(technologyRoutingOperationDto)), TechnologyRoutingOperationVo.class);
        return technologyRoutingOperationMapper.listTechnologyRoutingOperation(technologyRoutingOperationDto);
    }
    @Override
    public TechnologyRoutingOperationVo getTechnologyRoutingOperationInfo(Long id) {
        TechnologyRoutingOperation technologyRoutingOperation = this.getById(id);
        if (technologyRoutingOperation == null) {
            return null;
        }
        return BeanUtil.copyProperties(technologyRoutingOperation, TechnologyRoutingOperationVo.class);
        return technologyRoutingOperationMapper.getTechnologyRoutingOperationInfo(id);
    }
    @Override
@@ -58,7 +53,14 @@
        if (technologyRoutingOperation.getDragSort() == null || technologyRoutingOperation.getDragSort() <= 0) {
            technologyRoutingOperation.setDragSort(nextDragSort(technologyRoutingOperation.getTechnologyRoutingId()));
        }
        return this.save(technologyRoutingOperation);
        boolean saved = this.save(technologyRoutingOperation);
        if (saved) {
            TechnologyRoutingOperationParamSyncDto syncDto = new TechnologyRoutingOperationParamSyncDto();
            syncDto.setTechnologyRoutingOperationId(technologyRoutingOperation.getId());
            syncDto.setReplaceExisting(true);
            technologyRoutingOperationParamService.syncTechnologyRoutingOperationParam(syncDto);
        }
        return saved;
    }
    @Override
@@ -72,22 +74,6 @@
            resetDragSort(technologyRoutingOperation.getTechnologyRoutingId());
        }
        return removed;
    }
    private LambdaQueryWrapper<TechnologyRoutingOperation> buildQueryWrapper(TechnologyRoutingOperationDto technologyRoutingOperation) {
        LambdaQueryWrapper<TechnologyRoutingOperation> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.eq(technologyRoutingOperation.getId() != null, TechnologyRoutingOperation::getId, technologyRoutingOperation.getId())
                .eq(technologyRoutingOperation.getTechnologyRoutingId() != null,
                        TechnologyRoutingOperation::getTechnologyRoutingId, technologyRoutingOperation.getTechnologyRoutingId())
                .eq(technologyRoutingOperation.getProductModelId() != null,
                        TechnologyRoutingOperation::getProductModelId, technologyRoutingOperation.getProductModelId())
                .eq(technologyRoutingOperation.getTechnologyOperationId() != null,
                        TechnologyRoutingOperation::getTechnologyOperationId, technologyRoutingOperation.getTechnologyOperationId())
                .eq(technologyRoutingOperation.getIsQuality() != null,
                        TechnologyRoutingOperation::getIsQuality, technologyRoutingOperation.getIsQuality())
                .orderByAsc(TechnologyRoutingOperation::getDragSort)
                .orderByAsc(TechnologyRoutingOperation::getId);
        return queryWrapper;
    }
    private Integer nextDragSort(Long technologyRoutingId) {