根据车间筛选设备调整

hyingbo

10 小时以前 189c22920f56eccf89090197e82de8dae57c4a01

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

@@ -161,13 +161,13 @@
            if (StringUtils.isNotBlank(eamEquipment.getPerformanceIndicators())) {
                queryWrapper.like("e.performance_indicators", eamEquipment.getPerformanceIndicators());
            }
            if(oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())){
                queryWrapper.ge("e.leave_factory_date",eamEquipment.getLeaveFactoryStartTime());
                queryWrapper.le("e.leave_factory_date",eamEquipment.getLeaveFactoryEndTime());
            if (oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())) {
                queryWrapper.ge("e.leave_factory_date", eamEquipment.getLeaveFactoryStartTime());
                queryWrapper.le("e.leave_factory_date", eamEquipment.getLeaveFactoryEndTime());
            }
            if(oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())){
                queryWrapper.ge("e.acceptance_check_date",eamEquipment.getAcceptanceCheckStartTime());
                queryWrapper.le("e.acceptance_check_date",eamEquipment.getAcceptanceCheckEndTime());
            if (oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())) {
                queryWrapper.ge("e.acceptance_check_date", eamEquipment.getAcceptanceCheckStartTime());
                queryWrapper.le("e.acceptance_check_date", eamEquipment.getAcceptanceCheckEndTime());
            }
            if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
                //车间编码不为空
@@ -304,12 +304,12 @@
            statistics.setHighPrecisionOriginalValue(CollectionUtils.isNotEmpty(equipmentCategoryList) ? equipmentCategoryList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);

            //设置国产信息
            List<EamEquipment> equipmentDomesticList = eamEquipmentList.stream().filter(eamEquipment -> "china".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
            List<EamEquipment> equipmentDomesticList = eamEquipmentList.stream().filter(eamEquipment -> "中国".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
            statistics.setDomesticCount(CollectionUtils.isNotEmpty(equipmentDomesticList) ? equipmentDomesticList.size() : 0);
            statistics.setDomesticOriginalValue(CollectionUtils.isNotEmpty(equipmentDomesticList) ? equipmentDomesticList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);

            //设置进口信息
            List<EamEquipment> equipmentImportList = eamEquipmentList.stream().filter(eamEquipment -> !"china".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
            List<EamEquipment> equipmentImportList = eamEquipmentList.stream().filter(eamEquipment -> !"中国".equals(eamEquipment.getOriginCountry())).collect(Collectors.toList());
            statistics.setImportCount(CollectionUtils.isNotEmpty(equipmentImportList) ? equipmentImportList.size() : 0);
            statistics.setImportOriginalValue(CollectionUtils.isNotEmpty(equipmentImportList) ? equipmentImportList.stream().map(eamEquipment -> eamEquipment.getOriginalValue() != null ? eamEquipment.getOriginalValue() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add) : BigDecimal.ZERO);

@@ -385,4 +385,17 @@
        }
    }

    @Override
    public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList) {
        List<EquipmentSearchResult> resultList = new ArrayList<>();
        if (CollectionUtils.isNotEmpty(orgIdList)) {
            List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getOrgId, orgIdList));
            if (CollectionUtils.isNotEmpty(eamEquipmentList)) {
                for (EamEquipment eamEquipment : eamEquipmentList) {
                    resultList.add(new EquipmentSearchResult(eamEquipment));
                }
            }
        }
        return resultList;
    }
}