From 5f0bc1e4ad0c51a8bf1382dc3f98e282c1393c3b Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 11 九月 2025 17:48:55 +0800 Subject: [PATCH] 真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java index 6db6954..7204e45 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceFurnaceServiceImpl.java @@ -21,6 +21,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.EamThirdMaintenanceOrderExport; import org.jeecg.modules.eam.entity.EamBaseHFCode; import org.jeecg.modules.eam.entity.EamEquipment; import org.jeecg.modules.eam.entity.EamThirdMaintenanceFurnace; @@ -275,6 +276,47 @@ } /** + * 鎵归噺鎵撳嵃鐪熺┖鐑鐞嗕笁淇� + * @param ids + * @return + */ + @Override + public List<EamThirdMaintenanceFurnace> export(String ids){ + QueryWrapper<EamThirdMaintenanceFurnace> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tmf路.del_flag",CommonConstant.DEL_FLAG_0.toString()); + queryWrapper.eq("tmf.maintenance_status",ThirdMaintenanceFurnaceStatusEnum.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("tmf.id", idList); + } else { + queryWrapper.orderByDesc("tmf.create_time"); + } + return this.baseMapper.queryList(queryWrapper); + } + + /** * 璁剧疆娴佺▼鍙橀噺 */ private void setupProcessVariables(EamThirdMaintenanceFurnaceRequest request, EamThirdMaintenanceFurnace entity, LoginUser user, EamEquipment equipment) { -- Gitblit v1.9.3