lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -60,5 +60,5 @@ ModelAndView exportLedgerStatisticsXls(HttpServletRequest request, Class<EquipmentCategoryStatistics> equipmentCategoryStatisticsClass, String 台账统计); List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds); List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList); } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -386,10 +386,10 @@ } @Override public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds) { public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> orgIdList) { List<EquipmentSearchResult> resultList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(equipmentIds)) { List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getEquipmentCode, equipmentIds)); if (CollectionUtils.isNotEmpty(orgIdList)) { List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getOrgId, orgIdList)); if (CollectionUtils.isNotEmpty(eamEquipmentList)) { for (EamEquipment eamEquipment : eamEquipmentList) { resultList.add(new EquipmentSearchResult(eamEquipment)); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -371,12 +371,13 @@ @ApiOperation(value = "设备表-异步加载设备列表", notes = "设备表-异步加载设备列表") @GetMapping(value = "/asyncLoadEquipmentByProduction") public Result<?> asyncLoadEquipmentByProduction(@RequestParam(name="productionId",required = false) String productionId) { List<String> equipmentIds = Lists.newArrayList(); if (StringUtils.isNotBlank(productionId)) { equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(productionId); List<String> partProduction = Lists.newArrayList(); if (StringUtils.isNotEmpty(productionId)) { //key不为空，查询所有下级产线id partProduction = mdcEquipmentService.findAllProductions(productionId); partProduction.add(productionId); } List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(equipmentIds); List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(partProduction); return Result.ok(resultList); }
@@ -253,4 +253,6 @@ * @return */ List<MdcEquipment> getEquipmentList(); List<String> findAllProductions(String key); } lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -703,7 +703,7 @@ /** * 根据父级id递归查询所有下级id集合 */ private List<String> findAllProductions(String key) { public List<String> findAllProductions(String key) { List<String> productions = new ArrayList<>(); List<MdcProduction> mdcProductions = mdcProductionService.queryProdByPid(key); if (mdcProductions != null && !mdcProductions.isEmpty()) {
