1.待入库煤质维护入正式库 2.电子档案tree

liding

2 天以前 c0efb2e8358f4e7ee0774c340afd453c3d0c2471

 basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalPlanServiceImpl.java

@@ -6,15 +6,21 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CoalPlanDto;
import com.ruoyi.basic.entity.CoalField;
import com.ruoyi.basic.entity.CoalPlan;
import com.ruoyi.basic.mapper.CoalFieldMapper;
import com.ruoyi.basic.mapper.CoalPlanMapper;
import com.ruoyi.basic.service.CoalPlanService;
import com.ruoyi.basic.vo.CoalFieldVo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -30,10 +36,15 @@

    private final CoalPlanMapper coalPlanMapper;

    private final CoalFieldMapper coalFieldMapper;

    @Override
    public IPage<CoalPlan> selectCoalFieldList(Page page, CoalPlanDto coalPlanDto) {
        LambdaQueryWrapper<CoalPlan> queryWrapper = new LambdaQueryWrapper<>();
        return coalPlanMapper.selectPage(page,queryWrapper);
        if (StringUtils.hasText(coalPlanDto.getSearchAll())){
            queryWrapper.like(CoalPlan::getPlan,coalPlanDto.getSearchAll());
        }
        return coalPlanMapper.selectPage(page, queryWrapper);
    }

    @Override
@@ -65,4 +76,22 @@
    public List<CoalPlan> selectAllList() {
        return coalPlanMapper.selectList(null);
    }

    @Override
    public List<CoalFieldVo> selectCoalPlanById(Long id) {
        CoalPlan coalPlan = coalPlanMapper.selectById(id);
        LambdaQueryWrapper<CoalField> coalFieldLambdaQueryWrapper = new LambdaQueryWrapper<>();
        List<Long> ids = Arrays.stream(coalPlan.getFieldIds().split(",")).map(String::trim).map(Long::parseLong).collect(Collectors.toList());
        coalFieldLambdaQueryWrapper.in(CoalField::getId, ids);
        List<CoalField> coalFields = coalFieldMapper.selectList(coalFieldLambdaQueryWrapper);
        return coalFields.stream()
                .map(coalField -> {
                    CoalFieldVo dto = new CoalFieldVo();
                    dto.setId(coalField.getId());
                    dto.setFields(coalField.getFields());
                    dto.setFieldName(coalField.getFieldName());
                    return dto;
                })
                .collect(Collectors.toList());
    }
}