提交

“linengliang”

2023-12-28 b17ab31f94fb11f7098e4c91f9b4386b2020f676

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

@@ -14,6 +14,7 @@
//import org.jeecg.modules.system.entity.SysUpload;
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: equipment_report_repair
@@ -104,8 +106,33 @@
        }
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank((String)params.get("nums"))){
            equipNums = Arrays.asList(((String) params.get("nums")).trim().split(","));
            equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
        }
        return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ;
    }

    @Override
    public List<RepairReportExportVo> exportList(RepairReportExportVo repairReportExportVo) {
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(repairReportExportVo.getNums())){
            equipNums = Arrays.asList(repairReportExportVo.getNums().trim().split("\n"));
        }
        return baseMapper.exportList(
                repairReportExportVo.getNum(),
                repairReportExportVo.getFaultStartTime(),
                repairReportExportVo.getFaultEndTime(),
                repairReportExportVo.getIsStop(),
                repairReportExportVo.getStatus(),
                repairReportExportVo.getErrUda2(),
                repairReportExportVo.getErrUda1(),
                repairReportExportVo.getCreateBy(),
                repairReportExportVo.getEquipmentNum(),
                repairReportExportVo.getEquipmentName(),
                repairReportExportVo.getModel(),
                repairReportExportVo.getSpecification(),
                repairReportExportVo.getUseId(),
                equipNums
        );

    }
}