cuilei
8 天以前 1563fa33e203959c80ee713ffff3cad2f825b098
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -86,12 +86,10 @@
                queryWrapper.eq("ems.standard_status", eamMaintenanceStandard.getStandardStatus());
            }
            //设备编码
            if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentCode())) {
                queryWrapper.like("e.equipment_code", eamMaintenanceStandard.getEquipmentCode());
            }
            //设备名称
            if(StringUtils.isNotBlank(eamMaintenanceStandard.getEquipmentName())) {
                queryWrapper.like("e.equipment_name", eamMaintenanceStandard.getEquipmentName());
            if(StringUtils.isNotBlank(eamMaintenanceStandard.getKeyword())) {
                queryWrapper.and(wrapper -> wrapper.like("e.equipment_name", eamMaintenanceStandard.getKeyword())
                        .or()
                        .like("e.equipment_code", eamMaintenanceStandard.getKeyword()));
            }
        }
        queryWrapper.orderByDesc("ems.create_time");
@@ -277,8 +275,7 @@
        Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(1, pageSize);
        EamMaintenanceStandard query = new EamMaintenanceStandard();
        query.setEquipmentId(equipmentId);
        query.setEquipmentCode(keyword);
        query.setEquipmentName(keyword);
        query.setKeyword(keyword);
        query.setMaintenanceCategory(maintenanceCategory);
        query.setStandardStatus(MaintenanceStandardStatusEnum.NORMAL.name());
        IPage<EamMaintenanceStandard> pageData = this.queryPageList(page, query);