Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingOperationParamServiceImpl.java

@@ -3,6 +3,7 @@
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.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -90,23 +91,25 @@
            );
        }
        int successCount = 0;
        for (TechnologyOperationParam operationParam : operationParamList) {
            boolean exists = technologyRoutingOperationParamMapper.selectCount(
                    Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
                            .eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, routingOperation.getId())
                            .eq(TechnologyRoutingOperationParam::getTechnologyOperationParamId, operationParam.getId())
            ) > 0;
            if (!replaceExisting && exists) {
                continue;
        if (CollectionUtils.isNotEmpty(operationParamList)) {
            for (TechnologyOperationParam operationParam : operationParamList) {
                boolean exists = technologyRoutingOperationParamMapper.selectCount(
                        Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
                                .eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, routingOperation.getId())
                                .eq(TechnologyRoutingOperationParam::getTechnologyOperationParamId, operationParam.getId())
                ) > 0;
                if (!replaceExisting && exists) {
                    continue;
                }
                TechnologyRoutingOperationParam snapshot = new TechnologyRoutingOperationParam();
                snapshot.setTechnologyRoutingOperationId(routingOperation.getId());
                snapshot.setTechnologyOperationParamId(operationParam.getId());
                snapshot.setTechnologyOperationId(operationParam.getTechnologyOperationId());
                snapshot.setStandardValue(operationParam.getStandardValue());
                fillFromOperationParam(snapshot, routingOperation);
                technologyRoutingOperationParamMapper.insert(snapshot);
                successCount++;
            }
            TechnologyRoutingOperationParam snapshot = new TechnologyRoutingOperationParam();
            snapshot.setTechnologyRoutingOperationId(routingOperation.getId());
            snapshot.setTechnologyOperationParamId(operationParam.getId());
            snapshot.setTechnologyOperationId(operationParam.getTechnologyOperationId());
            snapshot.setStandardValue(operationParam.getStandardValue());
            fillFromOperationParam(snapshot, routingOperation);
            technologyRoutingOperationParamMapper.insert(snapshot);
            successCount++;
        }
        return successCount;
    }