fix: 工序根据条件返回全部/启用数据

gongchunyi

3 天以前 bbdaa26536663fe9d85d45c734acf3638393a7db

 src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -51,7 +52,7 @@
            productProcessMapper.updateById(productProcess);
            return AjaxResult.success();
        }
        return AjaxResult.error();
        return AjaxResult.success();
    }

    @Override
@@ -62,11 +63,19 @@
            if(CollectionUtils.isEmpty(productProcessList)){
                return AjaxResult.warn("模板错误或导入数据为空");
            }
            productProcessList.forEach(productProcess -> {
                if (ObjectUtils.isEmpty(productProcess)) {
                    throw new RuntimeException("使用模板进行导入");
                }
                if (ObjectUtils.isEmpty(productProcess.getName())) {
                    throw new RuntimeException("工序名称不能为空");
                }
            });
            this.saveOrUpdateBatch(productProcessList);
            return AjaxResult.success(true);
        }catch (Exception e){
            e.printStackTrace();
            return AjaxResult.error("导入失败");
            return AjaxResult.error(e.getMessage());
        }
    }

@@ -81,4 +90,10 @@
        productProcessMapper.deleteBatchIds(ids);
        return null;
    }

    @Override
    public List<ProductProcess> productProcessList(Integer dateType) {
        return baseMapper.selectList(new LambdaQueryWrapper<ProductProcess>()
                .eq(dateType != null, ProductProcess::getStatus, 1));
    }
}