修改检索nc文件bug

lyh

2025-06-17 511d8bd98ee50ecf9377c0ac4df25be5d277a03e

修改检索nc文件bug

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java

@@ -540,10 +540,10 @@
            List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(processIds,
                    DocAttributionTypeEnum.PROCESS.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
            if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
                List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                docQuery.setAttributionIds(String.join(",",deviceTypeIds));
                docQuery.setDocClassCode("NC");
                docQuery.setAttributionType(DocAttributionTypeEnum.PROCESS.getCode());
                docInfos=docInfoService.findListByDocQuery(docQuery);
@@ -554,6 +554,10 @@
                treeInfoRequest.setProcessIds(id);
                List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
                docInfos.addAll(docInfoList);
            }else {
                treeInfoRequest.setProcessIds(processIds);
                List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
                docInfos.addAll(docInfoList);
            }
            return docInfos;
        }

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java

@@ -469,10 +469,10 @@
            List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(workStepIds,
                    DocAttributionTypeEnum.WORKSITE.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
            if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
                List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getDeviceManagementId).collect(Collectors.toList());
                List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                docQuery.setAttributionIds(String.join(",",deviceTypeIds));
                docQuery.setDocClassCode("NC");
                docQuery.setAttributionType(DocAttributionTypeEnum.WORKSITE.getCode());
                docInfos=docInfoService.findListByDocQuery(docQuery);