From 1b5a723592ea63e5eec0bdeef7855b9c40e9df71 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 03 七月 2025 17:46:35 +0800 Subject: [PATCH] art:三保-设计修改 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java index 19c81b7..570ee6a 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java @@ -274,6 +274,90 @@ } /** + * 璁惧鍙拌处瀵煎嚭 + * @param eamEquipment + * @return + */ + @Override + public List<EamEquipment> exportList(EamEquipmentQuery eamEquipment){ + QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0); + //鐢ㄦ埛鏁版嵁鏉冮檺 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser == null) { + return new ArrayList<>(); + } + if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) { + //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧 + List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(",")); + queryWrapper.in("e.equipment_code", equipArr); + } else { + //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶� + List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. + list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); + if(!CollectionUtils.isEmpty(baseFactoryUserList)){ + List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); + List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); + queryWrapper.in("e.factory_code", factoryCode); + } + + } + //鏌ヨ鏉′欢杩囨护 + if (eamEquipment != null) { + if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) { + queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode()); + } + if (StringUtils.isNotBlank(eamEquipment.getEquipmentName())) { + queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName()); + } + if (StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())) { + queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance()); + } + if (StringUtils.isNotBlank(eamEquipment.getAssetStatus())) { + queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus()); + } + if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) { + queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus()); + } + if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) { + queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem()); + } + if (StringUtils.isNotBlank(eamEquipment.getOrgId())) { + //杞﹂棿缂栫爜涓嶄负绌� + List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId()); + if (CollectionUtil.isNotEmpty(productIds)) { + //涓嶅仛绛涢�� + queryWrapper.in("e.org_id", productIds); + } + } + if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) { + queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory()); + } + if (StringUtils.isNotBlank(eamEquipment.getId())) { + queryWrapper.eq("e.id", eamEquipment.getId()); + } + //鎺掑簭 + if (StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())) { + //queryWrapper.like("column", eamEquipment.getColumn()); + String column = eamEquipment.getColumn(); + if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { + column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX)); + } + if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) { + queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column)); + } else { + queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column)); + } + } else { + queryWrapper.orderByDesc("e.create_time"); + } + } else { + queryWrapper.orderByDesc("e.create_time"); + } + return eamEquipmentMapper.queryList(queryWrapper); + } + + /** * 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級 */ private void getAllProductionIds(List<MdcProduction> productionList, String productionId, List<String> allProductionIds) { -- Gitblit v1.9.3