From ba11a11662a027e89f3e86d063b3234aeeb76d83 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 22 八月 2025 17:22:56 +0800 Subject: [PATCH] 设备管理首页 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 66 +++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java index 2b9c57c..e32fe77 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java @@ -22,6 +22,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog; import org.jeecg.modules.eam.constant.*; +import org.jeecg.modules.eam.dto.EamSecondMaintenanceOrderExport; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.mapper.EamEquipmentMapper; import org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper; @@ -95,6 +96,8 @@ private EamMaintenanceStandardMapper eamMaintenanceStandardMapper; @Resource private BaseFactoryMapper baseFactoryMapper; + @Autowired + private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService; @Override public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) { @@ -666,6 +669,69 @@ return entity; } + /** + * 鎵归噺鎵撳嵃浜屼繚宸ュ崟 + * @param ids + * @return + */ + @Override + public List<EamSecondMaintenanceOrderExport> export(String ids){ + QueryWrapper<EamSecondMaintenanceOrderExport> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString()); + queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name()); + //鐢ㄦ埛鏁版嵁鏉冮檺 + 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)){ + Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); + Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); + queryWrapper.in("e.factory_org_code", factoryCode); + } else { + return new ArrayList<>(); + } + } + //鏌ヨ鏉′欢杩囨护 + if (StrUtil.isNotEmpty(ids)) { + List<String> idList = Arrays.asList(ids.split(",")); + queryWrapper.in("wmo.id", idList); + } else { + queryWrapper.orderByDesc("wmo.create_time"); + } + List<EamSecondMaintenanceOrderExport> eamSecondMaintenanceOrderExports=eamSecondMaintenanceOrderMapper.queryList(queryWrapper); + //濉厖瀵瑰簲浜屼繚鏄庣粏 + if (!eamSecondMaintenanceOrderExports.isEmpty()){ + eamSecondMaintenanceOrderExports.forEach(item->{ + //缁翠慨浜哄憳淇濆吇鍐呭 + List<EamSecondMaintenanceOrderDetail> maintenanceOrderDetails=eamSecondMaintenanceOrderDetailService. + list(new QueryWrapper<EamSecondMaintenanceOrderDetail>().eq("order_id",item.getId()). + eq("item_category",EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name()) + .orderByAsc("item_code")); + if (!maintenanceOrderDetails.isEmpty()){ + item.setMaintenanceOrderDetails(maintenanceOrderDetails); + } + //鎿嶄綔浜哄憳淇濆吇鍐呭 + List<EamSecondMaintenanceOrderDetail> operationOrderDetails=eamSecondMaintenanceOrderDetailService. + list(new QueryWrapper<EamSecondMaintenanceOrderDetail>().eq("order_id",item.getId()). + eq("item_category",EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name()) + .orderByAsc("item_code")); + if (!operationOrderDetails.isEmpty()) { + item.setOperationOrderDetails(operationOrderDetails); + } + }); + } + return eamSecondMaintenanceOrderExports; + } + private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) { List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class); return todoUsers != null && todoUsers.contains(user.getUsername()); -- Gitblit v1.9.3