增加报表

qushaowei

2024-01-31 a5bb107b88b161bd59edb68fa5be7e52137af839

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
@@ -14,8 +15,11 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * @Description: mom_eam_equipment
@@ -100,6 +104,10 @@
    @Override
    public Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment) {
        String sql = equipment.getEquipmentCategoryUda1();
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(equipment.getNums())){
            equipNums = Arrays.asList(equipment.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return page.setRecords(baseMapper.getEquipmentList(
                page,
                equipment.getNum(),
@@ -118,6 +126,8 @@
                equipment.getLineId(),
                equipment.getIsLineEquip(),
                equipment.getIsLine(),
                equipment.getEquipmentCategoryId(),
                equipNums,
                sql
        ));
    }
@@ -126,4 +136,10 @@
    public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type) {
        return page.setRecords(baseMapper.getStandardList(page,mainId,type));
    }

    @Override
    public IPage<Map<String, Object>> getEquipmentListAllStandard(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.getBaseMapper().getEquipmentListAllStandard(pageData,params);
    }
}