问题处理

hx-mes/src/main/java/com/fjhx/mes/service/technology/impl/TechnologyServiceImpl.java

@@ -122,25 +122,29 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
 
     @Override
     public TechnologyVo detail(Long id) {
-        Technology Technology = this.getById(id);
-        TechnologyVo result = BeanUtil.toBean(Technology, TechnologyVo.class);
+        Technology technology = this.getById(id);
+        TechnologyVo result = BeanUtil.toBean(technology, TechnologyVo.class);
         //获取适用产品信息
         List<ApplicableProducts> list = applicableProductsService.list(q -> q.eq(ApplicableProducts::getTechnologyId, result.getId()));
         List<Long> productList = list.stream().map(ApplicableProducts::getProductId).collect(Collectors.toList());
         List<ProductInfo> productInfos = productInfoService.listByIds(productList);
         result.setApplicableProductsList(productInfos);
         //获取工艺线路信息
+        List<TechnologyProcessLine> processRoute = technologyProcessLineService.list(q -> q.eq(TechnologyProcessLine::getTechnologyId, technology.getId()));
+        List<Long> processRouteIds = processRoute.stream().map(TechnologyProcessLine::getTargetProcessesId).collect(Collectors.toList());
+        if (ObjectUtil.isNotEmpty(processRouteIds)) {
 //        List<String> processRouteIds = Arrays.asList(result.getProcessRoute().split(","));
-//        List<ProductionProcesses> productionProcessesList = productionProcessesService.listByIds(processRouteIds);
-//        Map<Long, ProductionProcesses> productionProcessesMap = productionProcessesList.stream()
-//                .collect(Collectors.groupingBy(ProductionProcesses::getId,
-//                        Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-        //对工艺线路排序必须按照前端提交的顺序排序
-//        List<ProductionProcesses> newProductionProcessesList = new ArrayList<>();
-//        for (String processRouteId : processRouteIds) {
-//            newProductionProcessesList.add(productionProcessesMap.get(Long.parseLong(processRouteId)));
-//        }
-//        result.setProcessRouteList(newProductionProcessesList);
+            List<ProductionProcesses> productionProcessesList = productionProcessesService.listByIds(processRouteIds);
+            Map<Long, ProductionProcesses> productionProcessesMap = productionProcessesList.stream()
+                    .collect(Collectors.groupingBy(ProductionProcesses::getId,
+                            Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+            //对工艺线路排序必须按照前端提交的顺序排序
+            List<ProductionProcesses> newProductionProcessesList = new ArrayList<>();
+            for (Long processRouteId : processRouteIds) {
+                newProductionProcessesList.add(productionProcessesMap.get(processRouteId));
+            }
+            result.setProcessRouteList(newProductionProcessesList);
+        }
         return result;
     }