提交

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -9,6 +9,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.deptProcess.domain.BizDeptProcess;
 import cn.ezhizao.project.business.deptProcess.service.IBizDeptProcessService;
+import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
+import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.service.IBizTechnologicalProcessDetailDrawingService;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawingRecords.domain.BizTechnologicalProcessDetailDrawingRecords;
@@ -40,6 +42,8 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     private IBizTechnologicalProcessDetailDrawingRecordsService bizTechnologicalProcessDetailDrawingRecordsService;
     @Resource
     private IBizDeptProcessService bizDeptProcessService;
+    @Resource
+    private IBizTechnologicalProcessDetailService iBizTechnologicalProcessDetailService;
 
     /**
      * 查询电子图纸列表
@@ -59,10 +63,11 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
 //        setTenantId(bizTechnologicalProcessDetailDrawing);
 //        startPage();
         List<BizDeptProcess> bizDeptProcesses = bizDeptProcessService.query().eq("dept_id", bizTechnologicalProcessDetailDrawing.getDeptId()).list();
-        bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
-        List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
+        List<BizTechnologicalProcessDetail> technologicalProcessDetails = iBizTechnologicalProcessDetailService.query().eq("product_id", bizTechnologicalProcessDetailDrawing.getProductId()).eq("technology_version", bizTechnologicalProcessDetailDrawing.getProductVersion()).list();
+//        bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
+//        List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
 
-        return success(bizDeptProcesses.stream().filter(v -> list.stream().anyMatch(t -> t.getProcessCode().equals(v.getProcessCode()))).collect(Collectors.toList()));
+        return success(technologicalProcessDetails.stream().filter(v -> bizDeptProcesses.stream().anyMatch(t -> t.getProcessId().equals(v.getProcessId()))).collect(Collectors.toList()));
     }
     /**
      * 查询电子图纸列表