大修项修现场问题处理

hyingbo

11 小时以前 34eb84feb716412afd4229a83d4afbb204d5d6bc

 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())) {
                //车间编码不为空
@@ -385,4 +385,17 @@
        }
    }

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